Add IsAuthenticated() method to SigninManager.

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 "components/signin/core/browser/signin_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 147 matching lines @@
   void ShutDownManager() {
     DCHECK(manager_);
     manager_->RemoveObserver(&test_observer_);
     manager_->Shutdown();
     if (naked_manager_)
       naked_manager_.reset(NULL);
     manager_ = NULL;
   }
 
   void ExpectSignInWithRefreshTokenSuccess() {
-    EXPECT_FALSE(manager_->GetAuthenticatedUsername().empty());
+    EXPECT_TRUE(manager_->IsAuthenticated());
 
     ProfileOAuth2TokenService* token_service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
     EXPECT_TRUE(token_service->RefreshTokenIsAvailable(
         manager_->GetAuthenticatedUsername()));
 
     // Should go into token service and stop.
     EXPECT_EQ(1, test_observer_.num_successful_signins_);
     EXPECT_EQ(0, test_observer_.num_failed_signins_);
   }
 
   void CompleteSigninCallback(const std::string& oauth_token) {
     oauth_tokens_fetched_.push_back(oauth_token);
     manager_->CompletePendingSignin();
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   net::TestURLFetcherFactory factory_;
   scoped_ptr<SigninManager> naked_manager_;
   SigninManager* manager_;
   TestSigninManagerObserver test_observer_;
   scoped_ptr<TestingProfile> profile_;
   std::vector<std::string> oauth_tokens_fetched_;
   scoped_ptr<TestingPrefServiceSimple> prefs_;
   std::vector<std::string> cookies_;
 };
 
 TEST_F(SigninManagerTest, SignInWithRefreshToken) {
   SetUpSigninManagerAsService();
-  EXPECT_TRUE(manager_->GetAuthenticatedUsername().empty());
+  EXPECT_FALSE(manager_->IsAuthenticated());
 
   manager_->StartSignInWithRefreshToken(
       "rt1",
       "user@gmail.com",
       "password",
       SigninManager::OAuthTokenFetchedCallback());
 
   ExpectSignInWithRefreshTokenSuccess();
 
   // Should persist across resets.
   ShutDownManager();
   CreateNakedSigninManager();
   manager_->Initialize(NULL);
   EXPECT_EQ("user@gmail.com", manager_->GetAuthenticatedUsername());
 }
 
 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 =
       base::Bind(&SigninManagerTest::CompleteSigninCallback,
                  base::Unretained(this));
   manager_->StartSignInWithRefreshToken(
       "rt1",
       "user@gmail.com",
       "password",
       callback);
 
   ExpectSignInWithRefreshTokenSuccess();
   ASSERT_EQ(1U, oauth_tokens_fetched_.size());
   EXPECT_EQ(oauth_tokens_fetched_[0], "rt1");
 }
 
 TEST_F(SigninManagerTest, SignOut) {
   SetUpSigninManagerAsService();
   manager_->StartSignInWithRefreshToken(
       "rt1",
       "user@gmail.com",
       "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) {
   EXPECT_FALSE(SigninManager::IsWebBasedSigninFlowURL(
       GURL("http://www.google.com")));
   EXPECT_TRUE(SigninManager::IsWebBasedSigninFlowURL(
       GURL("https://accounts.google.com/ServiceLogin?service=chromiumsync")));
   EXPECT_FALSE(SigninManager::IsWebBasedSigninFlowURL(
       GURL("http://accounts.google.com/ServiceLogin?service=chromiumsync")));
   // http, not https, should not be treated as web based signin.
@@ skipping 70 matching lines @@
             profile()->GetPrefs()->GetString(prefs::kGoogleServicesUsername));
   EXPECT_EQ("external@example.com", manager_->GetAuthenticatedUsername());
 }
 
 TEST_F(SigninManagerTest, SigninNotAllowed) {
   std::string user("user@google.com");
   profile()->GetPrefs()->SetString(prefs::kGoogleServicesUsername, user);
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   SetUpSigninManagerAsService();
 }