Make the SigninErrorController a PKS.

chrome/browser/ui/webui/options/supervised_user_import_handler.cc

 // Copyright 2014 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/options/supervised_user_import_handler.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.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/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.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_manager.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/theme_resources.h"
 
 namespace {
 
 scoped_ptr<base::ListValue> GetAvatarIcons() {
   scoped_ptr<base::ListValue> avatar_icons(new base::ListValue);
   for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {
@@ skipping 49 matching lines @@
   localized_strings->Set("avatarIcons", GetAvatarIcons().release());
 }
 
 void SupervisedUserImportHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!profile->IsSupervised()) {
     SupervisedUserSyncService* sync_service =
         SupervisedUserSyncServiceFactory::GetForProfile(profile);
     if (sync_service) {
       sync_service->AddObserver(this);
-      observer_.Add(ProfileOAuth2TokenServiceFactory::GetForProfile(profile)->
-                        signin_error_controller());
+      observer_.Add(SigninErrorControllerFactory::GetForProfile(profile));
       SupervisedUserSharedSettingsService* settings_service =
           SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
               profile);
       subscription_ = settings_service->Subscribe(
           base::Bind(&SupervisedUserImportHandler::OnSharedSettingChanged,
                      weak_ptr_factory_.GetWeakPtr()));
     } else {
       DCHECK(!SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
                  profile));
-      DCHECK(!ProfileOAuth2TokenServiceFactory::GetForProfile(profile));
+      DCHECK(!SigninErrorControllerFactory::GetForProfile(profile));
     }
   }
 }
 
 void SupervisedUserImportHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("requestSupervisedUserImportUpdate",
       base::Bind(&SupervisedUserImportHandler::
                       RequestSupervisedUserImportUpdate,
                  base::Unretained(this)));
 }
@@ skipping 99 matching lines @@
 
 bool SupervisedUserImportHandler::IsAccountConnected() const {
   Profile* profile = Profile::FromWebUI(web_ui());
   SigninManagerBase* signin_manager =
       SigninManagerFactory::GetForProfile(profile);
   return signin_manager && signin_manager->IsAuthenticated();
 }
 
 bool SupervisedUserImportHandler::HasAuthError() const {
   Profile* profile = Profile::FromWebUI(web_ui());
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
-  if (!token_service)
+  SigninErrorController* error_controller =
+      SigninErrorControllerFactory::GetForProfile(profile);
+  if (!error_controller)
     return true;
 
-  SigninErrorController* error_controller =
-      token_service->signin_error_controller();
-
   GoogleServiceAuthError::State state = error_controller->auth_error().state();
 
   return state == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
       state == GoogleServiceAuthError::USER_NOT_SIGNED_UP ||
       state == GoogleServiceAuthError::ACCOUNT_DELETED ||
       state == GoogleServiceAuthError::ACCOUNT_DISABLED;
 }
 
 void SupervisedUserImportHandler::OnSharedSettingChanged(
     const std::string& supervised_user_id,
     const std::string& key) {
   if (key == supervised_users::kChromeAvatarIndex)
     FetchSupervisedUsers();
 }
 
 void SupervisedUserImportHandler::OnErrorChanged() {
   FetchSupervisedUsers();
 }
 
 }  // namespace options