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

chrome/browser/ui/webui/signin/inline_login_handler_impl.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/ui/webui/signin/inline_login_handler_impl.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/chrome_signin_client_factory.h"
 #include "chrome/browser/signin/local_auth.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
-#include "chrome/browser/ui/sync/one_click_signin_histogram.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "components/signin/core/browser/about_signin_internals.h"
 #include "components/signin/core/browser/account_tracker_service.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
+#include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_ui.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/url_util.h"
 
@@ skipping 75 matching lines @@
   about_signin_internals->OnRefreshTokenReceived("Successful");
 
   AccountTrackerService* account_tracker =
       AccountTrackerServiceFactory::GetForProfile(profile_);
   std::string account_id =
       account_tracker->PickAccountIdForAccount(gaia_id_, email_);
 
   // Prime the account tracker with this combination of gaia id/display email.
   account_tracker->SeedAccountInfo(gaia_id_, email_);
 
-  signin::Source source = signin::GetSourceForPromoURL(current_url_);
+  signin_metrics::Source source = signin::GetSourceForPromoURL(current_url_);
 
   std::string primary_email =
       SigninManagerFactory::GetForProfile(profile_)->GetAuthenticatedUsername();
   if (gaia::AreEmailsSame(email_, primary_email) &&
-      source == signin::SOURCE_REAUTH &&
+      source == signin_metrics::SOURCE_REAUTH &&
       switches::IsNewProfileManagement() &&
       !password_.empty() &&
       profiles::IsLockAvailable(profile_)) {
     chrome::SetLocalAuthCredentials(profile_, password_);
   }
 
-  if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
-      source == signin::SOURCE_REAUTH) {
+  if (source == signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
+      source == signin_metrics::SOURCE_REAUTH) {
     ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
         UpdateCredentials(account_id, result.refresh_token);
 
     if (signin::IsAutoCloseEnabledInURL(current_url_)) {
       // Close the gaia sign in tab via a task to make sure we aren't in the
       // middle of any webui handler code.
       base::MessageLoop::current()->PostTask(
           FROM_HERE,
           base::Bind(&InlineLoginHandlerImpl::CloseTab,
           handler_,
           signin::ShouldShowAccountManagement(current_url_)));
     }
   } else {
     ProfileSyncService* sync_service =
         ProfileSyncServiceFactory::GetForProfile(profile_);
     SigninErrorController* error_controller =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)->
             signin_error_controller();
 
     bool is_new_avatar_menu = switches::IsNewAvatarMenu();
 
     OneClickSigninSyncStarter::StartSyncMode start_mode;
-    if (source == signin::SOURCE_SETTINGS || choose_what_to_sync_) {
+    if (source == signin_metrics::SOURCE_SETTINGS || choose_what_to_sync_) {
       bool show_settings_without_configure =
           error_controller->HasError() &&
           sync_service &&
           sync_service->HasSyncSetupCompleted();
       start_mode = show_settings_without_configure ?
           OneClickSigninSyncStarter::SHOW_SETTINGS_WITHOUT_CONFIGURE :
           OneClickSigninSyncStarter::CONFIGURE_SYNC_FIRST;
     } else {
       start_mode = is_new_avatar_menu ?
           OneClickSigninSyncStarter::CONFIRM_SYNC_SETTINGS_FIRST :
           OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS;
     }
 
     OneClickSigninSyncStarter::ConfirmationRequired confirmation_required;
     if (confirm_untrusted_signin_) {
       confirmation_required =
           OneClickSigninSyncStarter::CONFIRM_UNTRUSTED_SIGNIN;
     } else if (is_new_avatar_menu) {
       confirmation_required = OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
     } else {
       confirmation_required =
-          source == signin::SOURCE_SETTINGS ||
+          source == signin_metrics::SOURCE_SETTINGS ||
           choose_what_to_sync_ ?
               OneClickSigninSyncStarter::NO_CONFIRMATION :
               OneClickSigninSyncStarter::CONFIRM_AFTER_SIGNIN;
     }
 
     bool start_signin =
         !OneClickSigninHelper::HandleCrossAccountError(
             profile_, "",
             email_, password_, result.refresh_token,
             OneClickSigninHelper::AUTO_ACCEPT_EXPLICIT,
@@ skipping 67 matching lines @@
 
 void InlineLoginHandlerImpl::SetExtraInitParams(base::DictionaryValue& params) {
   params.SetString("service", "chromiumsync");
 
   content::WebContents* contents = web_ui()->GetWebContents();
   const GURL& current_url = contents->GetURL();
   std::string is_constrained;
   net::GetValueForKeyInQuery(current_url, "constrained", &is_constrained);
 
   content::WebContentsObserver::Observe(contents);
-
-  signin::Source source = signin::GetSourceForPromoURL(current_url);
-  OneClickSigninHelper::LogHistogramValue(
-      source, one_click_signin::HISTOGRAM_SHOWN);
+  OneClickSigninHelper::LogHistogramValue(signin_metrics::HISTOGRAM_SHOWN);
 }
 
 void InlineLoginHandlerImpl::CompleteLogin(const base::ListValue* args) {
   content::WebContents* contents = web_ui()->GetWebContents();
   const GURL& current_url = contents->GetURL();
 
   const base::DictionaryValue* dict = NULL;
   args->GetDictionary(0, &dict);
 
   bool skip_for_now = false;
@@ skipping 35 matching lines @@
   }
 
   base::string16 session_index_string16;
   dict->GetString("sessionIndex", &session_index_string16);
   std::string session_index = base::UTF16ToASCII(session_index_string16);
   DCHECK(!session_index.empty());
 
   bool choose_what_to_sync = false;
   dict->GetBoolean("chooseWhatToSync", &choose_what_to_sync);
 
-  signin::Source source = signin::GetSourceForPromoURL(current_url);
+  signin_metrics::Source source = signin::GetSourceForPromoURL(current_url);
+  OneClickSigninHelper::LogHistogramValue(signin_metrics::HISTOGRAM_ACCEPTED);
+  bool switch_to_advanced =
+      choose_what_to_sync && (source != signin_metrics::SOURCE_SETTINGS);
   OneClickSigninHelper::LogHistogramValue(
-      source, one_click_signin::HISTOGRAM_ACCEPTED);
-  bool switch_to_advanced =
-      choose_what_to_sync && (source != signin::SOURCE_SETTINGS);
-  OneClickSigninHelper::LogHistogramValue(
-      source,
-      switch_to_advanced ? one_click_signin::HISTOGRAM_WITH_ADVANCED :
-                           one_click_signin::HISTOGRAM_WITH_DEFAULTS);
+      switch_to_advanced ? signin_metrics::HISTOGRAM_WITH_ADVANCED :
+                           signin_metrics::HISTOGRAM_WITH_DEFAULTS);
 
   OneClickSigninHelper::CanOfferFor can_offer_for =
       OneClickSigninHelper::CAN_OFFER_FOR_ALL;
   switch (source) {
-    case signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT:
+    case signin_metrics::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT:
       can_offer_for = OneClickSigninHelper::CAN_OFFER_FOR_SECONDARY_ACCOUNT;
       break;
-    case signin::SOURCE_REAUTH: {
+    case signin_metrics::SOURCE_REAUTH: {
       std::string primary_username =
           SigninManagerFactory::GetForProfile(
               Profile::FromWebUI(web_ui()))->GetAuthenticatedUsername();
       if (!gaia::AreEmailsSame(default_email, primary_username))
         can_offer_for = OneClickSigninHelper::CAN_OFFER_FOR_SECONDARY_ACCOUNT;
       break;
     }
     default:
       // No need to change |can_offer_for|.
       break;
@@ skipping 55 matching lines @@
   content::WebContents* contents = web_ui()->GetWebContents();
 
   if (contents->GetController().GetPendingEntry()) {
     // Do nothing if a navigation is pending, since this call can be triggered
     // from DidStartLoading. This avoids deleting the pending entry while we are
     // still navigating to it. See crbug/346632.
     return;
   }
 
   const GURL& current_url = contents->GetLastCommittedURL();
-  signin::Source source = signin::GetSourceForPromoURL(current_url);
+  signin_metrics::Source source = signin::GetSourceForPromoURL(current_url);
   bool auto_close = signin::IsAutoCloseEnabledInURL(current_url);
 
   if (result == OneClickSigninSyncStarter::SYNC_SETUP_FAILURE) {
     OneClickSigninHelper::RedirectToNtpOrAppsPage(contents, source);
   } else if (auto_close) {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&InlineLoginHandlerImpl::CloseTab,
                    weak_factory_.GetWeakPtr(),
                    signin::ShouldShowAccountManagement(current_url)));
@@ skipping 15 matching lines @@
       }
     }
 
     if (show_account_management) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
             BrowserWindow::AVATAR_BUBBLE_MODE_ACCOUNT_MANAGEMENT,
             signin::ManageAccountsParams());
     }
   }
 }