Abstract most Profile knowledge from SigninManager.

Abstract most Profile knowledge from SigninManager.

This CL eliminates almost all usage of Profile in SigninManager:
- It now gets the PrefService from the SigninClient.
- It now gets the URLRequestContext from the SigninClient.
- It has the ProfileOAuth2TokenService passed in explicitly.
- The static method DisableOneClickSignIn() now takes in a PrefService instead
  of a Profile.

The only remaining usage is sending the Profile as a notification source, which
will go away shortly when those notifications are removed.

BUG=334209
TBR=thakis

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=260456

[blundell, 2014-03-28 12:00:31]

droger: For review.
rogerta: FYI.

[droger, 2014-03-28 12:16:19]

lgtm

[blundell, 2014-03-28 14:00:11]

TBR=thakis for //chrome/common

[blundell, 2014-03-28 17:06:11]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-28 17:07:33]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/1

[commit-bot: I haz the power, 2014-03-28 17:07:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 17:07:59]

Failed to apply patch for chrome/browser/signin/signin_manager.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/signin/signin_manager.cc
  Hunk #2 succeeded at 20 with fuzz 2.
  Hunk #3 FAILED at 65.
  Hunk #4 succeeded at 84 (offset -37 lines).
  Hunk #5 succeeded at 211 (offset -37 lines).
  Hunk #6 succeeded at 219 (offset -37 lines).
  Hunk #7 succeeded at 246 (offset -37 lines).
  Hunk #8 succeeded at 260 (offset -37 lines).
  Hunk #9 succeeded at 342 (offset -37 lines).
  Hunk #10 succeeded at 358 (offset -37 lines).
  Hunk #11 succeeded at 395 with fuzz 1 (offset -37 lines).
  1 out of 11 hunks FAILED -- saving rejects to file
chrome/browser/signin/signin_manager.cc.rej

Patch:       chrome/browser/signin/signin_manager.cc
Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc
b/chrome/browser/signin/signin_manager.cc
index
2f51e85d799e1709bfaa76adecbaf634472e7944..c70f9568ff354433c9a7bed4029a6adbabfa894a
100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -13,8 +13,6 @@
 #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/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_account_id_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
@@ -22,6 +20,7 @@
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_internals_util.h"
 #include "components/signin/core/browser/signin_manager_cookie_helper.h"
+#include "components/signin/core/common/signin_pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/child_process_host.h"
@@ -66,14 +65,16 @@ bool SigninManager::IsWebBasedSigninFlowURL(const GURL& url)
{
           .find(kChromiumSyncService) != std::string::npos;
 }
 
-SigninManager::SigninManager(SigninClient* client)
+SigninManager::SigninManager(SigninClient* client,
+                             ProfileOAuth2TokenService* token_service)
     : SigninManagerBase(client),
       profile_(NULL),
       prohibit_signout_(false),
       type_(SIGNIN_TYPE_NONE),
       weak_pointer_factory_(this),
       signin_host_id_(ChildProcessHost::kInvalidUniqueID),
-      client_(client) {}
+      client_(client),
+      token_service_(token_service) {}
 
 void SigninManager::SetSigninProcess(int process_id) {
   if (process_id == signin_host_id_)
@@ -122,11 +123,9 @@ SigninManager::~SigninManager() {
 }
 
 void SigninManager::InitTokenService() {
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   const std::string& account_id = GetAuthenticatedUsername();
-  if (token_service && !account_id.empty())
-    token_service->LoadCredentials(account_id);
+  if (token_service_ && !account_id.empty())
+    token_service_->LoadCredentials(account_id);
 }
 
 std::string SigninManager::SigninTypeToString(
@@ -251,7 +250,7 @@ void SigninManager::SignOut() {
 
   const std::string& username = GetAuthenticatedUsername();
   clear_authenticated_username();
-  profile_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
+  client_->GetPrefs()->ClearPref(prefs::kGoogleServicesUsername);
 
   // Erase (now) stale information from AboutSigninInternals.
   NotifyDiagnosticsObservers(USERNAME, "");
@@ -259,11 +258,9 @@ void SigninManager::SignOut() {
   // Revoke all tokens before sending signed_out notification, because there
   // may be components that don't listen for token service events when the
   // profile is not connected to an account.
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   LOG(WARNING) << "Revoking refresh token on server. Reason: sign out, "
                << "IsSigninAllowed: " << IsSigninAllowed();
-  token_service->RevokeAllCredentials();
+  token_service_->RevokeAllCredentials();
 
   // TODO(blundell): Eliminate this notification send once crbug.com/333997 is
   // fixed.
@@ -288,12 +285,13 @@ void SigninManager::Initialize(Profile* profile,
PrefService* local_state) {
         base::Bind(&SigninManager::OnGoogleServicesUsernamePatternChanged,
                    weak_pointer_factory_.GetWeakPtr()));
   }
-  signin_allowed_.Init(prefs::kSigninAllowed, profile_->GetPrefs(),
-      base::Bind(&SigninManager::OnSigninAllowedPrefChanged,
-                 base::Unretained(this)));
+  signin_allowed_.Init(prefs::kSigninAllowed,
+                       client_->GetPrefs(),
+                       base::Bind(&SigninManager::OnSigninAllowedPrefChanged,
+                                  base::Unretained(this)));
 
-  std::string user = profile_->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
+  std::string user =
+      client_->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.
@@ -301,10 +299,8 @@ void SigninManager::Initialize(Profile* profile,
PrefService* local_state) {
   }
 
   InitTokenService();
-  account_id_helper_.reset(new SigninAccountIdHelper(
-      client_,
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_),
-      this));
+  account_id_helper_.reset(
+      new SigninAccountIdHelper(client_, token_service_, this));
 }
 
 void SigninManager::Shutdown() {
@@ -385,18 +381,14 @@ const std::string&
SigninManager::GetUsernameForAuthInProgress() const {
   return possibly_invalid_username_;
 }
 
-void SigninManager::DisableOneClickSignIn(Profile* profile) {
-  PrefService* pref_service = profile->GetPrefs();
-  pref_service->SetBoolean(prefs::kReverseAutologinEnabled, false);
+void SigninManager::DisableOneClickSignIn(PrefService* prefs) {
+  prefs->SetBoolean(prefs::kReverseAutologinEnabled, false);
 }
 
 void SigninManager::CompletePendingSignin() {
   DCHECK(!possibly_invalid_username_.empty());
   OnSignedIn(possibly_invalid_username_);
 
-  ProfileOAuth2TokenService* token_service =
-      ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
-
   // If inline sign in is enabled, but new profile management is not, perform a
   // merge session now to push the user's credentials into the cookie jar.
   bool do_merge_session_in_signin_manager =
@@ -405,13 +397,13 @@ void SigninManager::CompletePendingSignin() {
 
   if (do_merge_session_in_signin_manager) {
     merge_session_helper_.reset(new MergeSessionHelper(
-        token_service, profile_->GetRequestContext(), NULL));
+        token_service_, client_->GetURLRequestContext(), NULL));
   }
 
   DCHECK(!temp_refresh_token_.empty());
   DCHECK(!GetAuthenticatedUsername().empty());
-  token_service->UpdateCredentials(GetAuthenticatedUsername(),
-                                   temp_refresh_token_);
+  token_service_->UpdateCredentials(GetAuthenticatedUsername(),
+                                    temp_refresh_token_);
   temp_refresh_token_.clear();
 
   if (do_merge_session_in_signin_manager)
@@ -442,7 +434,7 @@ void SigninManager::OnSignedIn(const std::string& username)
{
   client_->GoogleSigninSucceeded(GetAuthenticatedUsername(), password_);
 
   password_.clear();  // Don't need it anymore.
-  DisableOneClickSignIn(profile_);  // Don't ever offer again.
+  DisableOneClickSignIn(client_->GetPrefs());  // Don't ever offer again.
 }
 
 void SigninManager::RenderProcessHostDestroyed(RenderProcessHost* host) {

[blundell, 2014-03-28 18:02:34]

The CQ bit was checked by blundell@chromium.org

[blundell, 2014-03-28 18:04:53]

The CQ bit was unchecked by blundell@chromium.org

[blundell, 2014-03-28 18:06:14]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-28 18:10:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/40001

[commit-bot: I haz the power, 2014-03-28 19:53:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 19:53:12]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[blundell, 2014-03-28 20:22:58]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-28 20:25:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/40001

[commit-bot: I haz the power, 2014-03-28 21:38:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-28 21:38:15]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[blundell, 2014-03-29 07:25:07]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-29 07:25:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/40001

[commit-bot: I haz the power, 2014-03-29 08:59:53]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-29 08:59:54]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[blundell, 2014-03-29 18:37:48]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-29 18:37:58]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/40001

[commit-bot: I haz the power, 2014-03-29 20:04:36]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-29 20:04:36]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_rel

[blundell, 2014-03-30 16:53:32]

The CQ bit was checked by blundell@chromium.org

[commit-bot: I haz the power, 2014-03-30 16:53:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/blundell@chromium.org/216493003/40001

[commit-bot: I haz the power, 2014-03-30 18:21:56]

Change committed as 260456