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

chrome/browser/signin/signin_promo.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/signin/signin_promo.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 155 matching lines @@
     const std::string& locale = g_browser_process->GetApplicationLocale();
     url = base::StringPrintf(kSignInLandingUrlPrefix, locale.c_str());
   } else {
     url = base::StringPrintf(
         "%s/success.html", extensions::kGaiaAuthExtensionOrigin);
   }
   base::StringAppendF(&url, "?%s=%d", option, value);
   return GURL(url);
 }
 
-GURL GetPromoURL(Source source, bool auto_close) {
+GURL GetPromoURL(signin_metrics::Source source, bool auto_close) {
   return GetPromoURL(source, auto_close, false /* is_constrained */);
 }
 
-GURL GetPromoURL(Source source, bool auto_close, bool is_constrained) {
-  DCHECK_NE(SOURCE_UNKNOWN, source);
+GURL GetPromoURL(signin_metrics::Source source,
+                 bool auto_close,
+                 bool is_constrained) {
+  DCHECK_NE(signin_metrics::SOURCE_UNKNOWN, source);
 
   if (!switches::IsEnableWebBasedSignin()) {
     std::string url(chrome::kChromeUIChromeSigninURL);
     base::StringAppendF(&url, "?%s=%d", kSignInPromoQueryKeySource, source);
     if (auto_close)
       base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyAutoClose);
     if (is_constrained)
       base::StringAppendF(&url, "&%s=1", kSignInPromoQueryKeyConstrained);
     return GURL(url);
   }
@@ skipping 28 matching lines @@
   return GaiaUrls::GetInstance()->service_login_url().Resolve(query_string);
 }
 
 GURL GetReauthURL(Profile* profile, const std::string& account_id) {
   AccountTrackerService::AccountInfo info =
       AccountTrackerServiceFactory::GetForProfile(profile)->
           GetAccountInfo(account_id);
 
   if (switches::IsEnableWebBasedSignin()) {
     return net::AppendQueryParameter(
-        signin::GetPromoURL(signin::SOURCE_SETTINGS, true),
+        signin::GetPromoURL(signin_metrics::SOURCE_SETTINGS, true),
         "Email",
         account_id);
   }
 
-  signin::Source source = switches::IsNewAvatarMenu() ?
-      signin::SOURCE_REAUTH : signin::SOURCE_SETTINGS;
+  signin_metrics::Source source = switches::IsNewAvatarMenu() ?
+      signin_metrics::SOURCE_REAUTH : signin_metrics::SOURCE_SETTINGS;
 
   GURL url = signin::GetPromoURL(
       source, true /* auto_close */,
       switches::IsNewAvatarMenu() /* is_constrained */);
   url = net::AppendQueryParameter(url, "email", info.email);
   url = net::AppendQueryParameter(url, "validateEmail", "1");
   return net::AppendQueryParameter(url, "readOnlyEmail", "1");
 }
 
 GURL GetNextPageURLForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyContinue, &value)) {
     GURL continue_url = GURL(value);
     if (continue_url.is_valid())
       return continue_url;
   }
 
   return GURL();
 }
 
 GURL GetSigninPartitionURL() {
   return GURL(switches::IsEnableWebviewBasedSignin() ?
       "chrome-guest://chrome-signin/?" :
       chrome::kChromeUIChromeSigninURL);
 }
 
-Source GetSourceForPromoURL(const GURL& url) {
+signin_metrics::Source GetSourceForPromoURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeySource, &value)) {
     int source = 0;
-    if (base::StringToInt(value, &source) && source >= SOURCE_START_PAGE &&
-        source < SOURCE_UNKNOWN) {
-      return static_cast<Source>(source);
+    if (base::StringToInt(value, &source) &&
+        source >= signin_metrics::SOURCE_START_PAGE &&
+        source < signin_metrics::SOURCE_UNKNOWN) {
+      return static_cast<signin_metrics::Source>(source);
     }
   }
-  return SOURCE_UNKNOWN;
+  return signin_metrics::SOURCE_UNKNOWN;
 }
 
 bool IsAutoCloseEnabledInURL(const GURL& url) {
   std::string value;
   if (net::GetValueForKeyInQuery(url, kSignInPromoQueryKeyAutoClose, &value)) {
     int enabled = 0;
     if (base::StringToInt(value, &enabled) && enabled == 1)
       return true;
   }
   return false;
@@ skipping 43 matching lines @@
       prefs::kSignInPromoShowOnFirstRunAllowed,
       true,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSignInPromoShowNTPBubble,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 }  // namespace signin