Upstream version 9.37.195.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / signin / signin_manager_unittest.cc

diff --git a/src/chrome/browser/signin/signin_manager_unittest.cc b/src/chrome/browser/signin/signin_manager_unittest.cc
index 86760aa..623a9e4 100644 (file)
--- a/src/chrome/browser/signin/signin_manager_unittest.cc
+++ b/src/chrome/browser/signin/signin_manager_unittest.cc
@@ -2,7 +2,7 @@
 // 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 "components/signin/core/browser/signin_manager.h"
 
 #include <vector>
 
@@ -46,8 +46,9 @@ KeyedService* SigninManagerBuild(content::BrowserContext* context) {
   SigninManager* service = NULL;
   Profile* profile = static_cast<Profile*>(context);
   service = new SigninManager(
-      ChromeSigninClientFactory::GetInstance()->GetForProfile(profile));
-  service->Initialize(profile, NULL);
+      ChromeSigninClientFactory::GetInstance()->GetForProfile(profile),
+      ProfileOAuth2TokenServiceFactory::GetForProfile(profile));
+  service->Initialize(NULL);
   return service;
 }
 
@@ -138,7 +139,8 @@ class SigninManagerTest : public testing::Test {
   void CreateNakedSigninManager() {
     DCHECK(!manager_);
     naked_manager_.reset(new SigninManager(
-        ChromeSigninClientFactory::GetInstance()->GetForProfile(profile())));
+        ChromeSigninClientFactory::GetInstance()->GetForProfile(profile()),
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile())));
 
     manager_ = naked_manager_.get();
     manager_->AddObserver(&test_observer_);
@@ -198,7 +200,7 @@ TEST_F(SigninManagerTest, SignInWithRefreshToken) {
   // Should persist across resets.
   ShutDownManager();
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), NULL);
+  manager_->Initialize(NULL);
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
@@ -228,12 +230,12 @@ TEST_F(SigninManagerTest, SignOut) {
       "user@gmail.com",
       "password",
       SigninManager::OAuthTokenFetchedCallback());
-  manager_->SignOut();
+  manager_->SignOut(signin_metrics::SIGNOUT_TEST);
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
   // Should not be persisted anymore
   ShutDownManager();
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), NULL);
+  manager_->Initialize(NULL);
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
@@ -243,10 +245,10 @@ TEST_F(SigninManagerTest, SignOutWhileProhibited) {
 
   manager_->SetAuthenticatedUsername("user@gmail.com");
   manager_->ProhibitSignout(true);
-  manager_->SignOut();
+  manager_->SignOut(signin_metrics::SIGNOUT_TEST);
   EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
   manager_->ProhibitSignout(false);
-  manager_->SignOut();
+  manager_->SignOut(signin_metrics::SIGNOUT_TEST);
   EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
 }
 
@@ -271,7 +273,7 @@ TEST_F(SigninManagerTest, Prohibited) {
   g_browser_process->local_state()->SetString(
       prefs::kGoogleServicesUsernamePattern, ".*@google.com");
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), g_browser_process->local_state());
+  manager_->Initialize(g_browser_process->local_state());
   EXPECT_TRUE(manager_->IsAllowedUsername("test@google.com"));
   EXPECT_TRUE(manager_->IsAllowedUsername("happy@google.com"));
   EXPECT_FALSE(manager_->IsAllowedUsername("test@invalid.com"));
@@ -285,7 +287,7 @@ TEST_F(SigninManagerTest, TestAlternateWildcard) {
   g_browser_process->local_state()->SetString(
       prefs::kGoogleServicesUsernamePattern, "*@google.com");
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), g_browser_process->local_state());
+  manager_->Initialize(g_browser_process->local_state());
   EXPECT_TRUE(manager_->IsAllowedUsername("test@google.com"));
   EXPECT_TRUE(manager_->IsAllowedUsername("happy@google.com"));
   EXPECT_FALSE(manager_->IsAllowedUsername("test@invalid.com"));
@@ -299,7 +301,7 @@ TEST_F(SigninManagerTest, ProhibitedAtStartup) {
   g_browser_process->local_state()->SetString(
       prefs::kGoogleServicesUsernamePattern, ".*@google.com");
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), g_browser_process->local_state());
+  manager_->Initialize(g_browser_process->local_state());
   // Currently signed in user is prohibited by policy, so should be signed out.
   EXPECT_EQ("", manager_->GetAuthenticatedUsername());
 }
@@ -308,7 +310,7 @@ TEST_F(SigninManagerTest, ProhibitedAfterStartup) {
   std::string user("monkey@invalid.com");
   profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, user);
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), g_browser_process->local_state());
+  manager_->Initialize(g_browser_process->local_state());
   EXPECT_EQ(user, manager_->GetAuthenticatedUsername());
   // Update the profile - user should be signed out.
   g_browser_process->local_state()->SetString(
@@ -318,7 +320,7 @@ TEST_F(SigninManagerTest, ProhibitedAfterStartup) {
 
 TEST_F(SigninManagerTest, ExternalSignIn) {
   CreateNakedSigninManager();
-  manager_->Initialize(profile(), g_browser_process->local_state());
+  manager_->Initialize(g_browser_process->local_state());
   EXPECT_EQ("",
             profile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername));
   EXPECT_EQ("", manager_->GetAuthenticatedUsername());