Initial refactoring complete

chrome/browser/sync/signin_manager_unittest.cc

Index: chrome/browser/sync/signin_manager_unittest.cc
diff --git a/chrome/browser/sync/signin_manager_unittest.cc b/chrome/browser/sync/signin_manager_unittest.cc
index 12c4204d266c50af76b5ff3b77660d01a8d612f9..979260aa089b9461bba2fbe228b9716fcb1945e2 100644
--- a/chrome/browser/sync/signin_manager_unittest.cc
+++ b/chrome/browser/sync/signin_manager_unittest.cc
@@ -3,14 +3,15 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/signin_manager.h"
+#include "chrome/browser/sync/signin_manager_client_login.h"
 
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/gaia/token_service_unittest.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
-#include "chrome/test/testing_profile.h"
 #include "chrome/test/signaling_task.h"
+#include "chrome/test/testing_profile.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 
@@ -20,7 +21,7 @@ class SigninManagerTest : public TokenServiceTestHarness {
  public:
   virtual void SetUp() {
     TokenServiceTestHarness::SetUp();
-    manager_.reset(new SigninManager());
+    manager_.reset(SigninManager::CreateSigninManager());
     google_login_success_.ListenFor(NotificationType::GOOGLE_SIGNIN_SUCCESSFUL,
                                     Source<Profile>(profile_.get()));
     google_login_failure_.ListenFor(NotificationType::GOOGLE_SIGNIN_FAILED,
@@ -71,7 +72,7 @@ TEST_F(SigninManagerTest, SignIn) {
   EXPECT_EQ(0U, google_login_failure_.size());
 
   // Should persist across resets.
-  manager_.reset(new SigninManager());
+  manager_.reset(SigninManager::CreateSigninManager());
   manager_->Initialize(profile_.get());
   EXPECT_EQ("user@gmail.com", manager_->GetUsername());
 }
@@ -80,13 +81,15 @@ TEST_F(SigninManagerTest, SignOut) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   SimulateValidResponse();
-  manager_->OnClientLoginSuccess(credentials_);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginSuccess(
+        static_cast<GaiaAuthConsumer::ClientLoginResult*>(&credentials_));
 
   EXPECT_EQ("user@gmail.com", manager_->GetUsername());
   manager_->SignOut();
   EXPECT_TRUE(manager_->GetUsername().empty());
   // Should not be persisted anymore
-  manager_.reset(new SigninManager());
+  manager_.reset(SigninManager::CreateSigninManager());
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetUsername().empty());
 }
@@ -95,7 +98,8 @@ TEST_F(SigninManagerTest, SignInFailure) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
-  manager_->OnClientLoginFailure(error);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginFailure(error);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
@@ -103,7 +107,7 @@ TEST_F(SigninManagerTest, SignInFailure) {
   EXPECT_TRUE(manager_->GetUsername().empty());
 
   // Should not be persisted
-  manager_.reset(new SigninManager());
+  manager_.reset(SigninManager::CreateSigninManager());
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetUsername().empty());
 }
@@ -112,7 +116,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorSuccess) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error(GoogleServiceAuthError::TWO_FACTOR);
-  manager_->OnClientLoginFailure(error);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginFailure(error);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
@@ -130,7 +135,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
   manager_->Initialize(profile_.get());
   manager_->StartSignIn("username", "password", "", "");
   GoogleServiceAuthError error1(GoogleServiceAuthError::TWO_FACTOR);
-  manager_->OnClientLoginFailure(error1);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginFailure(error1);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(1U, google_login_failure_.size());
@@ -140,7 +146,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
   manager_->ProvideSecondFactorAccessCode("badaccess");
   GoogleServiceAuthError error2(
       GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
-  manager_->OnClientLoginFailure(error2);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginFailure(error2);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(2U, google_login_failure_.size());
@@ -148,7 +155,8 @@ TEST_F(SigninManagerTest, ProvideSecondFactorFailure) {
 
   manager_->ProvideSecondFactorAccessCode("badaccess");
   GoogleServiceAuthError error3(GoogleServiceAuthError::CONNECTION_FAILED);
-  manager_->OnClientLoginFailure(error3);
+  static_cast<SigninManagerClientLogin*>(manager_.get())->
+      OnClientLoginFailure(error3);
 
   EXPECT_EQ(0U, google_login_success_.size());
   EXPECT_EQ(3U, google_login_failure_.size());