Add IsAuthenticated() method to SigninManager.

chrome/browser/ui/webui/sync_setup_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 292 matching lines @@
     { "fullEncryptionOption", IDS_SYNC_FULL_ENCRYPTION_DATA },
   };
 
   RegisterStrings(localized_strings, resources, arraysize(resources));
   RegisterTitle(localized_strings, "syncSetupOverlay", IDS_SYNC_SETUP_TITLE);
 }
 
 void SyncSetupHandler::DisplayConfigureSync(bool show_advanced,
                                             bool passphrase_failed) {
   // Should never call this when we are not signed in.
-  DCHECK(!SigninManagerFactory::GetForProfile(
-      GetProfile())->GetAuthenticatedUsername().empty());
+  DCHECK(SigninManagerFactory::GetForProfile(
+      GetProfile())->IsAuthenticated());
   ProfileSyncService* service = GetSyncService();
   DCHECK(service);
   if (!service->sync_initialized()) {
     service->UnsuppressAndStart();
 
     // See if it's even possible to bring up the sync backend - if not
     // (unrecoverable error?), don't bother displaying a spinner that will be
     // immediately closed because this leads to some ugly infinite UI loop (see
     // http://crbug.com/244769).
     if (SyncStartupTracker::GetSyncServiceState(GetProfile()) !=
@@ skipping 188 matching lines @@
   if (!browser) {
     // Settings is not displayed in a browser window. Open a new window.
     browser = new Browser(Browser::CreateParams(
         Browser::TYPE_TABBED, GetProfile(), chrome::GetActiveDesktop()));
   }
 
   // If the signin manager already has an authenticated username, this is a
   // re-auth scenario, and we need to ensure that the user signs in with the
   // same email address.
   GURL url;
-  std::string email = SigninManagerFactory::GetForProfile(
-      browser->profile())->GetAuthenticatedUsername();
-  if (!email.empty()) {
+  if (SigninManagerFactory::GetForProfile(
+      browser->profile())->IsAuthenticated()) {
     UMA_HISTOGRAM_ENUMERATION("Signin.Reauth",
                               signin::HISTOGRAM_SHOWN,
                               signin::HISTOGRAM_MAX);
 
     SigninErrorController* error_controller =
         ProfileOAuth2TokenServiceFactory::GetForProfile(browser->profile())->
             signin_error_controller();
     DCHECK(error_controller->HasError());
     if (switches::IsNewAvatarMenu()) {
       browser->window()->ShowAvatarBubbleFromAvatarButton(
@@ skipping 225 matching lines @@
 
 void SyncSetupHandler::HandleShowSetupUI(const base::ListValue* args) {
   if (!GetSyncService()) {
     DLOG(WARNING) << "Cannot display sync UI when sync is disabled";
     CloseUI();
     return;
   }
 
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(GetProfile());
-  if (signin->GetAuthenticatedUsername().empty()) {
+  if (!signin->IsAuthenticated()) {
     // For web-based signin, the signin page is not displayed in an overlay
     // on the settings page. So if we get here, it must be due to the user
     // cancelling signin (by reloading the sync settings page during initial
     // signin) or by directly navigating to settings/syncSetup
     // (http://crbug.com/229836). So just exit and go back to the settings page.
     DLOG(WARNING) << "Cannot display sync setup UI when not signed in";
     CloseUI();
     return;
   }
 
@@ skipping 17 matching lines @@
 // the user goes through the real signin flow to generate a new auth token.
 void SyncSetupHandler::HandleDoSignOutOnAuthError(const base::ListValue* args) {
   DVLOG(1) << "Signing out the user to fix a sync error.";
   chrome::AttemptUserExit();
 }
 #endif
 
 #if !defined(OS_CHROMEOS)
 void SyncSetupHandler::HandleStartSignin(const base::ListValue* args) {
   // Should only be called if the user is not already signed in.
-  DCHECK(SigninManagerFactory::GetForProfile(GetProfile())->
-      GetAuthenticatedUsername().empty());
+  DCHECK(!SigninManagerFactory::GetForProfile(GetProfile())->
+      IsAuthenticated());
   OpenSyncSetup();
 }
 
 void SyncSetupHandler::HandleStopSyncing(const base::ListValue* args) {
   if (GetSyncService())
     ProfileSyncService::SyncEvent(ProfileSyncService::STOP_FROM_OPTIONS);
   SigninManagerFactory::GetForProfile(GetProfile())->SignOut(
       signin_metrics::USER_CLICKED_SIGNOUT_SETTINGS);
 
   bool delete_profile = false;
@@ skipping 58 matching lines @@
 
   configuring_sync_ = false;
 }
 
 void SyncSetupHandler::OpenSyncSetup() {
   if (!PrepareSyncSetup())
     return;
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo.
-  // 2) Normal signin through settings page (GetAuthenticatedUsername() is
-  //    empty).
+  // 2) Normal signin through settings page (IsAuthenticated() is false).
   // 3) Previously working credentials have expired.
   // 4) User is signed in, but has stopped sync via the google dashboard, and
   //    signout is prohibited by policy so we need to force a re-auth.
   // 5) User clicks [Advanced Settings] button on options page while already
   //    logged in.
   // 6) One-click signin (credentials are already available, so should display
   //    sync configure UI, not login UI).
   // 7) User re-enables sync after disabling it via advanced settings.
 #if !defined(OS_CHROMEOS)
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(GetProfile());
 
-  if (signin->GetAuthenticatedUsername().empty() ||
+  if (!signin->IsAuthenticated() ||
       ProfileOAuth2TokenServiceFactory::GetForProfile(GetProfile())->
           signin_error_controller()->HasError()) {
     // User is not logged in (cases 1-2), or login has been specially requested
     // because previously working credentials have expired (case 3). Close sync
     // setup including any visible overlays, and display the gaia auth page.
     // Control will be returned to the sync settings page once auth is complete.
     CloseUI();
     DisplayGaiaLogin();
     return;
   }
@@ skipping 43 matching lines @@
 
   LoginUIService* service = GetLoginUIService();
   DCHECK(service);
   service->current_login_ui()->FocusUI();
   return true;
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }