Switch OneClickSigninHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index 2c9c4194a5e737541539ef5e87733b617af4b365..c61e07e0bf57b29a7eff4b2dcf4f278d3c78fa81 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -67,10 +67,6 @@ class WebIntentPickerGtk;
 class WebUITestContentsCreator;
 class ZoomController;
 
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-class OneClickSigninHelper;
-#endif
-
 namespace browser_sync {
 class SyncedTabDelegate;
 }
@@ -229,12 +225,6 @@ class TabContents : public content::WebContentsObserver {
   }
   InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
 
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-  OneClickSigninHelper* one_click_signin_helper() {
-    return one_click_signin_helper_.get();
-  }
-#endif
-
   PasswordManager* password_manager() { return password_manager_.get(); }
   PrefsTabHelper* prefs_tab_helper() { return prefs_tab_helper_.get(); }
 
@@ -354,9 +344,6 @@ class TabContents : public content::WebContentsObserver {
   scoped_ptr<extensions::WebNavigationTabObserver> webnavigation_observer_;
   scoped_ptr<ExternalProtocolObserver> external_protocol_observer_;
   scoped_ptr<NavigationMetricsRecorder> navigation_metrics_recorder_;
-#if defined(ENABLE_ONE_CLICK_SIGNIN)
-  scoped_ptr<OneClickSigninHelper> one_click_signin_helper_;
-#endif
   scoped_ptr<PepperBrokerObserver> pepper_broker_observer_;
   scoped_ptr<PluginObserver> plugin_observer_;
   scoped_ptr<printing::PrintPreviewMessageHandler> print_preview_;