Make the SigninErrorController a PKS.

chrome/browser/profiles/profiles_state.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/profiles/profiles_state.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/gaia_info_update_service.h"
 #include "chrome/browser/profiles/gaia_info_update_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/text_elider.h"
 
 namespace profiles {
@@ skipping 132 matching lines @@
   DCHECK(profile);
 
   GAIAInfoUpdateService* service =
       GAIAInfoUpdateServiceFactory::GetInstance()->GetForProfile(profile);
   // The service may be null, for example during unit tests.
   if (service)
     service->Update();
 }
 
 SigninErrorController* GetSigninErrorController(Profile* profile) {
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  return token_service ? token_service->signin_error_controller() : NULL;
+  return SigninErrorControllerFactory::GetForProfile(profile);
 }
 
 Profile* SetActiveProfileToGuestIfLocked() {
   Profile* active_profile = ProfileManager::GetLastUsedProfile();
   DCHECK(active_profile);
 
   if (active_profile->IsGuestSession())
     return active_profile;
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(active_profile->GetPath());
   if (!cache.ProfileIsSigninRequiredAtIndex(index))
     return NULL;
 
   // The guest profile must have been loaded already.
   Profile* guest_profile = profile_manager->GetProfile(
       ProfileManager::GetGuestProfilePath());
   DCHECK(guest_profile);
 
   PrefService* local_state = g_browser_process->local_state();
   DCHECK(local_state);
   local_state->SetString(prefs::kProfileLastUsed,
                          guest_profile->GetPath().BaseName().MaybeAsASCII());
   return guest_profile;
 }
 
 }  // namespace profiles