Upstream version 10.39.225.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 378fe7b..85a66ba 100644 (file)
--- a/src/chrome/browser/signin/signin_manager_unittest.cc
+++ b/src/chrome/browser/signin/signin_manager_unittest.cc
@@ -75,11 +75,14 @@ class TestSigninManagerObserver : public SigninManagerBase::Observer {
   }
 
   virtual void GoogleSigninSucceeded(
-      const std::string& username, const std::string& password) OVERRIDE {
+      const std::string& account_id,
+      const std::string& username,
+      const std::string& password) OVERRIDE {
     num_successful_signins_++;
   }
 
-  virtual void GoogleSignedOut(const std::string& username) OVERRIDE {
+  virtual void GoogleSignedOut(const std::string& account_id,
+                               const std::string& username) OVERRIDE {
     num_signouts_++;
   }
 };
@@ -165,7 +168,7 @@ class SigninManagerTest : public testing::Test {
   }
 
   void ExpectSignInWithRefreshTokenSuccess() {
-    EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
+    EXPECT_TRUE(manager_->IsAuthenticated());
 
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
@@ -195,7 +198,7 @@ class SigninManagerTest : public testing::Test {
 
 TEST_F(SigninManagerTest, SignInWithRefreshToken) {
   SetUpSigninManagerAsService();
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 
   manager_->StartSignInWithRefreshToken(
       "rt1",
@@ -214,7 +217,7 @@ TEST_F(SigninManagerTest, SignInWithRefreshToken) {
 
 TEST_F(SigninManagerTest, SignInWithRefreshTokenCallbackComplete) {
   SetUpSigninManagerAsService();
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 
   // Since the password is empty, must verify the gaia cookies first.
   SigninManager::OAuthTokenFetchedCallback callback =
@@ -239,25 +242,25 @@ TEST_F(SigninManagerTest, SignOut) {
       "password",
       SigninManager::OAuthTokenFetchedCallback());
   manager_->SignOut(signin_metrics::SIGNOUT_TEST);
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
   // Should not be persisted anymore
   ShutDownManager();
   CreateNakedSigninManager();
   manager_->Initialize(NULL);
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 }
 
 TEST_F(SigninManagerTest, SignOutWhileProhibited) {
   SetUpSigninManagerAsService();
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 
   manager_->SetAuthenticatedUsername("user@gmail.com");
   manager_->ProhibitSignout(true);
   manager_->SignOut(signin_metrics::SIGNOUT_TEST);
-  EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_TRUE(manager_->IsAuthenticated());
   manager_->ProhibitSignout(false);
   manager_->SignOut(signin_metrics::SIGNOUT_TEST);
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 }
 
 TEST_F(SigninManagerTest, TestIsWebBasedSigninFlowURL) {