Use OAuth2 token for sync

chrome/browser/signin/signin_tracker_unittest.cc

Index: chrome/browser/signin/signin_tracker_unittest.cc
diff --git a/chrome/browser/signin/signin_tracker_unittest.cc b/chrome/browser/signin/signin_tracker_unittest.cc
index 5f174a7b496af6c5712b0681d02bef4df36d1663..9a74676a3db31b975ef06c5990ab08533a631202 100644
--- a/chrome/browser/signin/signin_tracker_unittest.cc
+++ b/chrome/browser/signin/signin_tracker_unittest.cc
@@ -18,6 +18,7 @@
 #include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/test/test_browser_thread.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
@@ -59,12 +60,16 @@ class MockObserver : public SigninTracker::Observer {
 
 class SigninTrackerTest : public testing::Test {
  public:
-  SigninTrackerTest() {}
+  SigninTrackerTest()
+    : ui_thread_(content::BrowserThread::UI, &ui_loop_) {}
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile());
     mock_token_service_ = static_cast<MockTokenService*>(
         TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(), BuildMockTokenService));
+    mock_signin_manager_ = static_cast<FakeSigninManagerBase*>(
+        SigninManagerFactory::GetInstance()->SetTestingFactoryAndUse(
+            profile_.get(), FakeSigninManagerBase::Build));
     mock_pss_ = static_cast<ProfileSyncServiceMock*>(
         ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(
             profile_.get(),
@@ -91,6 +96,8 @@ class SigninTrackerTest : public testing::Test {
   FakeSigninManagerBase* mock_signin_manager_;
   MockTokenService* mock_token_service_;
   MockObserver observer_;
+  MessageLoop ui_loop_;
+  content::TestBrowserThread ui_thread_;
 };
 
 TEST_F(SigninTrackerTest, GaiaSignInFailed) {
@@ -128,7 +135,7 @@ static void ExpectSignedInSyncService(ProfileSyncServiceMock* sync_service,
   }
   EXPECT_CALL(*sync_service, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(true));
-  EXPECT_CALL(*sync_service, IsSyncTokenAvailable()).WillRepeatedly(
+  EXPECT_CALL(*sync_service, IsOAuthRefreshTokenAvailable()).WillRepeatedly(
       Return(true));
   EXPECT_CALL(*sync_service, waiting_for_auth()).WillRepeatedly(Return(false));
   EXPECT_CALL(*sync_service, GetAuthError()).WillRepeatedly(ReturnRef(error));
@@ -238,7 +245,7 @@ TEST_F(SigninTrackerTest, NoGaiaSigninWhenServicesNotRunning) {
       .WillRepeatedly(Return(true));
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(false));
-  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()).WillRepeatedly(
       Return(false));
   GoogleServiceSigninSuccessDetails details("username@gmail.com", "password");
   content::NotificationService::current()->Notify(
@@ -275,7 +282,7 @@ TEST_F(SigninTrackerTest, SyncSigninError) {
   EXPECT_CALL(observer_, GaiaCredentialsValid());
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(false));
-  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()).WillRepeatedly(
       Return(false));
   EXPECT_CALL(*mock_token_service_, HasTokenForService(_))
       .WillRepeatedly(Return(true));
@@ -324,7 +331,7 @@ TEST_F(SigninTrackerTest, SigninFailedSyncTokenUnavailable) {
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(true));
   // Inject Token unavailable error.
-  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()).WillRepeatedly(
       Return(false));
   EXPECT_CALL(*mock_pss_, waiting_for_auth()).WillRepeatedly(Return(false));
   EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));
@@ -348,7 +355,7 @@ TEST_F(SigninTrackerTest, SigninFailedGoogleServiceAuthError) {
   provider.SetAuthError(error);
   EXPECT_CALL(*mock_pss_, IsSyncEnabledAndLoggedIn()).WillRepeatedly(
       Return(true));
-  EXPECT_CALL(*mock_pss_, IsSyncTokenAvailable()).WillRepeatedly(
+  EXPECT_CALL(*mock_pss_, IsOAuthRefreshTokenAvailable()).WillRepeatedly(
       Return(true));
   EXPECT_CALL(*mock_pss_, waiting_for_auth()).WillRepeatedly(Return(false));
   EXPECT_CALL(*mock_pss_, GetAuthError()).WillRepeatedly(ReturnRef(error));