Clean up straggler classes to use embedded signin in page in the new profiles world.

chrome/browser/ui/sync/one_click_signin_helper.h

Index: chrome/browser/ui/sync/one_click_signin_helper.h
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
index a007d7dd56d7d37080f635b6f8a13d73f753eb8f..4366c365ebc508e7d2bf31b0c517fcfd3f5e46ba 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.h
+++ b/chrome/browser/ui/sync/one_click_signin_helper.h
@@ -102,7 +102,7 @@ class OneClickSigninHelper
                   const std::string& refresh_token,
                   content::WebContents* web_contents,
                   bool untrusted_confirmation_required,
-                  signin::Source source,
+                  signin_metrics::Source source,
                   OneClickSigninSyncStarter::Callback callback);
     ~StartSyncArgs();
 
@@ -119,7 +119,7 @@ class OneClickSigninHelper
     content::WebContents* web_contents;
 
     OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
-    signin::Source source;
+    signin_metrics::Source source;
     OneClickSigninSyncStarter::Callback callback;
   };
 
@@ -169,7 +169,7 @@ class OneClickSigninHelper
     DISALLOW_COPY_AND_ASSIGN(SyncStarterWrapper);
   };
 
-  static void LogHistogramValue(signin::Source source, int action);
+  static void LogHistogramValue(int action);
 
   // Returns true if the one-click signin feature can be offered at this time.
   // If |email| is not empty, then the profile is checked to see if it's
@@ -216,17 +216,17 @@ class OneClickSigninHelper
       const std::string& password,
       const std::string& refresh_token,
       OneClickSigninHelper::AutoAccept auto_accept,
-      signin::Source source,
+      signin_metrics::Source source,
       OneClickSigninSyncStarter::StartSyncMode start_mode,
       OneClickSigninSyncStarter::Callback sync_callback);
 
   static void RedirectToNtpOrAppsPage(
-      content::WebContents* contents, signin::Source source);
+      content::WebContents* contents, signin_metrics::Source source);
 
   // If the |source| is not settings page/webstore, redirects to
   // the NTP/Apps page.
   static void RedirectToNtpOrAppsPageIfNecessary(
-      content::WebContents* contents, signin::Source source);
+      content::WebContents* contents, signin_metrics::Source source);
 
   // Remove the item currently at the top of the history list if it's
   // the Gaia redirect URL. Due to limitations of the NavigationController
@@ -304,7 +304,7 @@ class OneClickSigninHelper
   static void ShowInfoBarUIThread(const std::string& session_index,
                                   const std::string& email,
                                   AutoAccept auto_accept,
-                                  signin::Source source,
+                                  signin_metrics::Source source,
                                   const GURL& continue_url,
                                   int child_id,
                                   int route_id);
@@ -352,7 +352,7 @@ class OneClickSigninHelper
   std::string email_;
   std::string password_;
   AutoAccept auto_accept_;
-  signin::Source source_;
+  signin_metrics::Source source_;
   bool switched_to_advanced_;
   GURL continue_url_;
   // The orignal continue URL after sync setup is complete.