Componentize SigninIdAccountHelper.

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
-#include "chrome/browser/signin/local_auth.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
-#include "chrome/browser/signin/signin_account_id_helper.h"
 #include "chrome/browser/signin/signin_internals_util.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
 #include "components/signin/core/profile_oauth2_token_service.h"
 #include "components/signin/core/signin_client.h"
 #include "components/signin/core/signin_manager_cookie_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 264 matching lines @@
 
   std::string user = profile_->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername);
   if ((!user.empty() && !IsAllowedUsername(user)) || !IsSigninAllowed()) {
     // User is signed in, but the username is invalid - the administrator must
     // have changed the policy since the last signin, so sign out the user.
     SignOut();
   }
 
   InitTokenService();
-  account_id_helper_.reset(new SigninAccountIdHelper(this));
+  client_->SigninManagerInitialized(this);
 }
 
 void SigninManager::Shutdown() {
   if (merge_session_helper_)
     merge_session_helper_->CancelAll();
 
   local_state_pref_registrar_.RemoveAll();
-  account_id_helper_.reset();
+  client_->SigninManagerShutdown(this);

[Roger Tawa OOO till Jul 10th, 2014/03/24 14:10:08]

At this point, the SM is sort of like half shutdown.  Maybe better to move this
to above line 308, and maybe rename the function to something that indicates its
more like a pre-shutdon hook?  Like BeforeSigninManagerShutdown() ?

   SigninManagerBase::Shutdown();
 }
 
 void SigninManager::OnGoogleServicesUsernamePatternChanged() {
   if (!GetAuthenticatedUsername().empty() &&
       !IsAllowedUsername(GetAuthenticatedUsername())) {
     // Signed in user is invalid according to the current policy so sign
     // the user out.
     SignOut();
   }
@@ skipping 112 matching lines @@
                                             password_);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
       content::Source<Profile>(profile_),
       content::Details<const GoogleServiceSigninSuccessDetails>(&details));
 
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     GoogleSigninSucceeded(GetAuthenticatedUsername(),
                                           password_));
 
-#if !defined(OS_ANDROID)
-  // Don't store password hash except for users of new profile features.
-  if (switches::IsNewProfileManagement())
-    chrome::SetLocalAuthCredentials(profile_, password_);
-#endif
+  client_->GoogleSigninSucceeded(GetAuthenticatedUsername(), password_);
 
   password_.clear();  // Don't need it anymore.
   DisableOneClickSignIn(profile_);  // Don't ever offer again.
 }
 
 void SigninManager::RenderProcessHostDestroyed(RenderProcessHost* host) {
   // It's possible we're listening to a "stale" renderer because it was replaced
   // with a new process by process-per-site. In either case, stop observing it,
   // but only reset signin_host_id_ tracking if this was from the current signin
   // process.
   signin_hosts_observed_.erase(host);
   if (signin_host_id_ == host->GetID())
     signin_host_id_ = ChildProcessHost::kInvalidUniqueID;
 }
 
 void SigninManager::ProhibitSignout(bool prohibit_signout) {
   prohibit_signout_ = prohibit_signout;
 }
 
 bool SigninManager::IsSignoutProhibited() const {
   return prohibit_signout_;
 }