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

chrome/browser/ui/sync/one_click_signin_helper.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 #define CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
@@ skipping 84 matching lines @@
     StartSyncArgs();
     StartSyncArgs(Profile* profile,
                   Browser* browser,
                   OneClickSigninHelper::AutoAccept auto_accept,
                   const std::string& session_index,
                   const std::string& email,
                   const std::string& password,
                   const std::string& refresh_token,
                   content::WebContents* web_contents,
                   bool untrusted_confirmation_required,
-                  signin::Source source,
+                  signin_metrics::Source source,
                   OneClickSigninSyncStarter::Callback callback);
     ~StartSyncArgs();
 
     Profile* profile;
     Browser* browser;
     OneClickSigninHelper::AutoAccept auto_accept;
     std::string session_index;
     std::string email;
     std::string password;
     std::string refresh_token;
 
     // Web contents in which the sync setup page should be displayed,
     // if necessary. Can be NULL.
     content::WebContents* web_contents;
 
     OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
-    signin::Source source;
+    signin_metrics::Source source;
     OneClickSigninSyncStarter::Callback callback;
   };
 
   // Wrapper to call OneClickSigninSyncStarter after fetching the refresh token
   // if needed.  Also verifies that the cookies are correct if no password is
   // specified, and checks that the email from the cookies match the expected
   // email address.
   class SyncStarterWrapper : public SigninOAuthHelper::Consumer,
                              public chrome::BrowserListObserver {
    public:
@@ skipping 29 matching lines @@
 
     OneClickSigninHelper::StartSyncArgs args_;
     chrome::HostDesktopType desktop_type_;
     OneClickSigninSyncStarter::StartSyncMode start_mode_;
     scoped_ptr<SigninOAuthHelper> signin_oauth_helper_;
     base::WeakPtrFactory<SyncStarterWrapper> weak_pointer_factory_;
 
     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
   // already connected to a google account or if the user has already rejected
   // one-click sign-in with this email, in which cases a one click signin
   // should not be offered.
   //
   // If |can_offer_for| is |CAN_OFFER_FOR_INTERSTITAL_ONLY|, then only do the
   // checks that would affect the interstitial page.  Otherwise, do the checks
   // that would affect the interstitial and the explicit sign ins.
@@ skipping 26 matching lines @@
   // the last signed in email of the current profile, then Chrome will show a
   // confirmation dialog before starting sync. It returns true if there is a
   // cross account error, and false otherwise.
   static bool HandleCrossAccountError(
       Profile* profile,
       const std::string& session_index,
       const std::string& email,
       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
   // this cannot be done until a new page becomes "current".
   static void RemoveSigninRedirectURLHistoryItem(
       content::WebContents* web_contents);
 
   static void LogConfirmHistogramValue(int action);
 
  private:
@@ skipping 57 matching lines @@
   // being used.
   //
   // |continue_url| is where Gaia will continue to when the sign in process is
   // done.  For explicit sign ins, this is a URL chrome controls. For one-click
   // sign in, this could be any google property.  This URL is used to know
   // when the sign process is over and to collect infomation from the user
   // entered on the Gaia sign in page (for explicit sign ins).
   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);
 
   void RedirectToSignin();
 
   // Clear all data member of the helper, except for the error.
   void CleanTransientState();
 
   // Unitests that use a TestingProfile should call this.
@@ skipping 27 matching lines @@
   // interstitial page. It's set to true the first time we load one of those
   // pages and set to false when transient state is cleaned.
   // Note: This should only be used for logging purposes.
   bool showing_signin_;
 
   // Information about the account that has just logged in.
   std::string session_index_;
   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.
   GURL original_continue_url_;
   std::string error_message_;
 
   // Number of navigations since starting a sign in that is outside the
   // the set of trusted Gaia URLs.  Sign in attempts that include visits to
   // one more untrusted will cause a modal dialog to appear asking the user
   // to confirm, similar to the interstitial flow.
@@ skipping 11 matching lines @@
 
   // Allows unittest to avoid starting sync for real.
   bool do_not_start_sync_for_testing_;
 
   base::WeakPtrFactory<OneClickSigninHelper> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OneClickSigninHelper);
 };
 
 #endif  // CHROME_BROWSER_UI_SYNC_ONE_CLICK_SIGNIN_HELPER_H_