Introduce SigninManagerDelegate and use to eliminate CookieSettings dependency.

chrome/browser/signin/signin_manager_unittest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_unittest.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/webdata/encryptor/encryptor.h"
 #include "content/public/browser/child_process_security_policy.h"
@@ skipping 39 matching lines @@
     profile_->GetRequestContext()->GetURLRequestContext();
     io_setup_complete->Signal();
   }
 
   virtual void SetUp() OVERRIDE {
     prefs_.reset(new TestingPrefServiceSimple);
     chrome::RegisterLocalState(prefs_->registry());
     TestingBrowserProcess::GetGlobal()->SetLocalState(
         prefs_.get());
     TokenServiceTestHarness::SetUp();
-    manager_.reset(new SigninManager());
+    manager_.reset(new SigninManager(
+        scoped_ptr<SigninManagerDelegate>(
+            new ChromeSigninManagerDelegate(profile_.get()))));
     google_login_success_.ListenFor(
         chrome::NOTIFICATION_GOOGLE_SIGNIN_SUCCESSFUL,
         content::Source<Profile>(profile_.get()));
     google_login_failure_.ListenFor(chrome::NOTIFICATION_GOOGLE_SIGNIN_FAILED,
                                     content::Source<Profile>(profile_.get()));
 
     io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));
     ASSERT_TRUE(io_thread_->Start());
     base::WaitableEvent io_setup_complete(true, false);
     BrowserThread::PostTask(
@@ skipping 113 matching lines @@
     // This is flow, the oauth2 credentials should already be available in
     // the token service.
     EXPECT_TRUE(service_->HasOAuthLoginToken());
 
     // Should go into token service and stop.
     EXPECT_EQ(1U, google_login_success_.size());
     EXPECT_EQ(0U, google_login_failure_.size());
 
     // Should persist across resets.
     manager_->Shutdown();
-    manager_.reset(new SigninManager());
+    manager_.reset(new SigninManager(
+        scoped_ptr<SigninManagerDelegate>(
+            new ChromeSigninManagerDelegate(profile_.get()))));
     manager_->Initialize(profile_.get());
     EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
   }
 
   // Helper method that wraps the logic when signin with credentials
   // should fail. If |requestSent| is true, then simulate valid resopnse.
   // Otherwise the sign-in is aborted before any request is sent, thus no need
   // to simulatate response.
   void ExpectSignInWithCredentialsFail(bool requestSent) {
     EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
@@ skipping 49 matching lines @@
 
   service_->OnIssueAuthTokenSuccess(GaiaConstants::kGaiaOAuth2LoginRefreshToken,
                                     "oauth2Token");
   SimulateValidUberToken();
   // Check that the login cookie has been sent.
   ASSERT_NE(std::find(cookies_.begin(), cookies_.end(), "checkCookie = true"),
             cookies_.end());
 
   // Should persist across resets.
   manager_->Shutdown();
-  manager_.reset(new SigninManager());
+  manager_.reset(new SigninManager(
+      scoped_ptr<SigninManagerDelegate>(
+          new ChromeSigninManagerDelegate(profile_.get()))));
   manager_->Initialize(profile_.get());
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SignInWithCredentials) {
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   manager_->StartSignInWithCredentials(
       "0",
@@ skipping 174 matching lines @@
   manager_->ClearTransientSigninData();
   EXPECT_TRUE(manager_->last_result_.data.empty());
   EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
 
   // Ensure preferences are not modified.
   EXPECT_FALSE(
      profile_->GetPrefs()->GetString(prefs::kGoogleServicesUsername).empty());
 
   // On reset it should be regenerated.
   manager_->Shutdown();
-  manager_.reset(new SigninManager());
+  manager_.reset(new SigninManager(
+      scoped_ptr<SigninManagerDelegate>(
+          new ChromeSigninManagerDelegate(profile_.get()))));
   manager_->Initialize(profile_.get());
 
   // Now make sure we have the right user name.
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SignOutClientLogin) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", std::string(), std::string());
   SimulateValidResponseClientLogin(false);
   manager_->OnClientLoginSuccess(credentials_);
 
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
   manager_->SignOut();
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
   // Should not be persisted anymore
   manager_->Shutdown();
-  manager_.reset(new SigninManager());
+  manager_.reset(new SigninManager(
+      scoped_ptr<SigninManagerDelegate>(
+          new ChromeSigninManagerDelegate(profile_.get()))));
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, SignInFailureClientLogin) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", std::string(), std::string());
   GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
   manager_->OnClientLoginFailure(error);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
 
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 
   // Should not be persisted
   manager_->Shutdown();
-  manager_.reset(new SigninManager());
+  manager_.reset(new SigninManager(
+      scoped_ptr<SigninManagerDelegate>(
+          new ChromeSigninManagerDelegate(profile_.get()))));
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
 TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", std::string(), std::string());
   GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
   manager_->OnClientLoginFailure(error);
 
@@ skipping 74 matching lines @@
       GURL("http://accounts.google.com/ServiceLogin?service=chromiumsync")));
   // http, not https, should not be treated as web based signin.
   EXPECT_FALSE(SigninManager::IsWebBasedSigninFlowURL(
       GURL("http://accounts.google.com/ServiceLogin?service=googlemail")));
   // chromiumsync is double-embedded in a continue query param.
   EXPECT_TRUE(SigninManager::IsWebBasedSigninFlowURL(
       GURL("https://accounts.google.com/CheckCookie?"
            "continue=https%3A%2F%2Fwww.google.com%2Fintl%2Fen-US%2Fchrome"
            "%2Fblank.html%3Fsource%3D3%26nonadv%3D1&service=chromiumsync")));
 }