Correctly integrate StoragePartition into TestingProfile.

chrome/browser/signin/token_service_unittest.cc

Index: chrome/browser/signin/token_service_unittest.cc
diff --git a/chrome/browser/signin/token_service_unittest.cc b/chrome/browser/signin/token_service_unittest.cc
index 50dc429610798e0a37798ad876e9880ab404e9e0..0617ae5764cc572f46ff2e87540af60a227a387b 100644
--- a/chrome/browser/signin/token_service_unittest.cc
+++ b/chrome/browser/signin/token_service_unittest.cc
@@ -9,8 +9,7 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
-#include "base/synchronization/waitable_event.h"
+#include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/webdata/token_web_data.h"
@@ -20,8 +19,6 @@
 #include "google_apis/gaia/mock_url_fetcher_factory.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 
-using content::BrowserThread;
-
 TokenAvailableTracker::TokenAvailableTracker() {}
 
 TokenAvailableTracker::~TokenAvailableTracker() {}
@@ -52,10 +49,7 @@ void TokenFailedTracker::Observe(int type,
   }
 }
 
-TokenServiceTestHarness::TokenServiceTestHarness()
-    : ui_thread_(BrowserThread::UI, &message_loop_),
-      db_thread_(BrowserThread::DB) {
-}
+TokenServiceTestHarness::TokenServiceTestHarness() {}
 
 TokenServiceTestHarness::~TokenServiceTestHarness() {}
 
@@ -70,12 +64,13 @@ void TokenServiceTestHarness::SetUp() {
   oauth_token_ = "oauth";
   oauth_secret_ = "secret";
 
-  ASSERT_TRUE(db_thread_.Start());
-
   profile_.reset(new TestingProfile());
   profile_->CreateWebDataService();
 
-  WaitForDBLoadCompletion();
+  // Force the loading of the WebDataService.
+  TokenWebData::FromBrowserContext(profile_.get());
+  base::RunLoop().RunUntilIdle();
+
   service_ = TokenServiceFactory::GetForProfile(profile_.get());
 
   success_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_AVAILABLE,
@@ -83,103 +78,78 @@ void TokenServiceTestHarness::SetUp() {
   failure_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
                              content::Source<TokenService>(service_));
 
-  service_->Initialize("test", profile_.get());
+  service()->Initialize("test", profile_.get());
 }
 
 void TokenServiceTestHarness::TearDown() {
-  // You have to destroy the profile before the db_thread_ stops.
-  if (profile_.get()) {
-    profile_.reset(NULL);
-  }
-  // Schedule another task on the DB thread to notify us that it's safe to
-  // carry on with the test.
-  base::WaitableEvent done(false, false);
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-      base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
-  done.Wait();
-  base::MessageLoop::current()->PostTask(FROM_HERE,
-                                         base::MessageLoop::QuitClosure());
-  base::MessageLoop::current()->Run();
-  db_thread_.Stop();
+  // You have to destroy the profile before the threads are shut down.
+  profile_.reset();
 }
 
-void TokenServiceTestHarness::WaitForDBLoadCompletion() {
-  // Force the loading of the WebDataService.
-  TokenWebData::FromBrowserContext(profile_.get());
-
-  // The WebDB does all work on the DB thread. This will add an event
-  // to the end of the DB thread, so when we reach this task, all DB
-  // operations should be complete.
-  base::WaitableEvent done(false, false);
-  BrowserThread::PostTask(
-      BrowserThread::DB,
-      FROM_HERE,
-      base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
-  done.Wait();
-
-  // Notifications should be returned from the DB thread onto the UI thread.
-  message_loop_.RunUntilIdle();
+void TokenServiceTestHarness::UpdateCredentialsOnService() {
+  service()->UpdateCredentials(credentials_);
 }
 
 class TokenServiceTest : public TokenServiceTestHarness {
  public:
   virtual void SetUp() {
     TokenServiceTestHarness::SetUp();
-    service_->UpdateCredentials(credentials_);
+    UpdateCredentialsOnService();
   }
  protected:
   void TestLoadSingleToken(
       std::map<std::string, std::string>* db_tokens,
       std::map<std::string, std::string>* memory_tokens,
-      const std::string& service) {
-    std::string token = service + "_token";
-    (*db_tokens)[service] = token;
-    size_t prev_success_size = success_tracker_.size();
-    service_->LoadTokensIntoMemory(*db_tokens, memory_tokens);
+      const std::string& service_name) {
+    std::string token = service_name + "_token";
+    (*db_tokens)[service_name] = token;
+    size_t prev_success_size = success_tracker()->size();
+    service()->LoadTokensIntoMemory(*db_tokens, memory_tokens);
 
     // Check notification.
-    EXPECT_EQ(prev_success_size + 1, success_tracker_.size());
-    TokenService::TokenAvailableDetails details = success_tracker_.details();
-    EXPECT_EQ(details.service(), service);
+    EXPECT_EQ(prev_success_size + 1, success_tracker()->size());
+    TokenService::TokenAvailableDetails details = success_tracker()->details();
+    EXPECT_EQ(details.service(), service_name);
     EXPECT_EQ(details.token(), token);
     // Check memory tokens.
-    EXPECT_EQ(1U, memory_tokens->count(service));
-    EXPECT_EQ((*memory_tokens)[service], token);
+    EXPECT_EQ(1U, memory_tokens->count(service_name));
+    EXPECT_EQ((*memory_tokens)[service_name], token);
   }
 };
 
 TEST_F(TokenServiceTest, SanityCheck) {
-  EXPECT_FALSE(service_->HasTokenForService("nonexistent service"));
-  EXPECT_FALSE(service_->TokensLoadedFromDB());
+  EXPECT_FALSE(service()->HasTokenForService("nonexistent service"));
+  EXPECT_FALSE(service()->TokensLoadedFromDB());
 }
 
 TEST_F(TokenServiceTest, NoToken) {
-  EXPECT_FALSE(service_->HasTokenForService("nonexistent service"));
-  EXPECT_EQ(service_->GetTokenForService("nonexistent service"), std::string());
+  EXPECT_FALSE(service()->HasTokenForService("nonexistent service"));
+  EXPECT_EQ(service()->GetTokenForService("nonexistent service"),
+            std::string());
 }
 
 TEST_F(TokenServiceTest, NotificationSuccess) {
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
-  EXPECT_EQ(1U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  EXPECT_EQ(1U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
 
-  TokenService::TokenAvailableDetails details = success_tracker_.details();
+  TokenService::TokenAvailableDetails details = success_tracker()->details();
   // MSVC doesn't like this comparison as EQ.
   EXPECT_TRUE(details.service() == GaiaConstants::kSyncService);
   EXPECT_EQ(details.token(), "token");
 }
 
 TEST_F(TokenServiceTest, NotificationOAuthLoginTokenSuccess) {
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
-  service_->OnClientOAuthSuccess(
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
+  service()->OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600));
-  EXPECT_EQ(1U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
+  EXPECT_EQ(1U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
 
-  TokenService::TokenAvailableDetails details = success_tracker_.details();
+  TokenService::TokenAvailableDetails details = success_tracker()->details();
   // MSVC doesn't like this comparison as EQ.
   EXPECT_TRUE(details.service() ==
       GaiaConstants::kGaiaOAuth2LoginRefreshToken);
@@ -187,28 +157,30 @@ TEST_F(TokenServiceTest, NotificationOAuthLoginTokenSuccess) {
 }
 
 TEST_F(TokenServiceTest, NotificationFailed) {
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
   GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
-  service_->OnIssueAuthTokenFailure(GaiaConstants::kSyncService, error);
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(1U, failure_tracker_.size());
+  service()->OnIssueAuthTokenFailure(GaiaConstants::kSyncService, error);
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(1U, failure_tracker()->size());
 
-  TokenService::TokenRequestFailedDetails details = failure_tracker_.details();
+  TokenService::TokenRequestFailedDetails details =
+      failure_tracker()->details();
   // MSVC doesn't like this comparison as EQ.
   EXPECT_TRUE(details.service() == GaiaConstants::kSyncService);
   EXPECT_TRUE(details.error() == error);  // Struct has no print function.
 }
 
 TEST_F(TokenServiceTest, NotificationOAuthLoginTokenFailed) {
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(0U, failure_tracker_.size());
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(0U, failure_tracker()->size());
   GoogleServiceAuthError error(GoogleServiceAuthError::REQUEST_CANCELED);
-  service_->OnClientOAuthFailure(error);
-  EXPECT_EQ(0U, success_tracker_.size());
-  EXPECT_EQ(1U, failure_tracker_.size());
+  service()->OnClientOAuthFailure(error);
+  EXPECT_EQ(0U, success_tracker()->size());
+  EXPECT_EQ(1U, failure_tracker()->size());
 
-  TokenService::TokenRequestFailedDetails details = failure_tracker_.details();
+  TokenService::TokenRequestFailedDetails details =
+      failure_tracker()->details();
 
   // MSVC doesn't like this comparison as EQ.
   EXPECT_TRUE(details.service() ==
@@ -217,69 +189,73 @@ TEST_F(TokenServiceTest, NotificationOAuthLoginTokenFailed) {
 }
 
 TEST_F(TokenServiceTest, OnTokenSuccessUpdate) {
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), "token");
-
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token2");
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService),
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService),
+            "token");
+
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token2");
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService),
             "token2");
 
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, std::string());
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), "");
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService,
+                                     std::string());
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService), "");
 }
 
 TEST_F(TokenServiceTest, OnOAuth2LoginTokenSuccessUpdate) {
-  EXPECT_FALSE(service_->HasOAuthLoginToken());
+  EXPECT_FALSE(service()->HasOAuthLoginToken());
 
-  service_->OnClientOAuthSuccess(
+  service()->OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600));
-  EXPECT_TRUE(service_->HasOAuthLoginToken());
-  EXPECT_EQ(service_->GetOAuth2LoginRefreshToken(), "rt1");
+  EXPECT_TRUE(service()->HasOAuthLoginToken());
+  EXPECT_EQ(service()->GetOAuth2LoginRefreshToken(), "rt1");
 
-  service_->OnClientOAuthSuccess(
+  service()->OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt2", "at2", 3600));
-  EXPECT_TRUE(service_->HasOAuthLoginToken());
-  EXPECT_EQ(service_->GetOAuth2LoginRefreshToken(), "rt2");
+  EXPECT_TRUE(service()->HasOAuthLoginToken());
+  EXPECT_EQ(service()->GetOAuth2LoginRefreshToken(), "rt2");
 
-  service_->OnClientOAuthSuccess(
+  service()->OnClientOAuthSuccess(
       GaiaAuthConsumer::ClientOAuthResult("rt3", "at3", 3600));
-  EXPECT_TRUE(service_->HasOAuthLoginToken());
-  EXPECT_EQ(service_->GetOAuth2LoginRefreshToken(), "rt3");
+  EXPECT_TRUE(service()->HasOAuthLoginToken());
+  EXPECT_EQ(service()->GetOAuth2LoginRefreshToken(), "rt3");
 }
 
 TEST_F(TokenServiceTest, OnTokenSuccess) {
   // Don't "start fetching", just go ahead and issue the callback.
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
   // Gaia returns the entire result as the token so while this is a shared
   // result with ClientLogin, it doesn't matter, we should still get it back.
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), "token");
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService),
+            "token");
 }
 
 TEST_F(TokenServiceTest, Reset) {
   net::TestURLFetcherFactory factory;
-  service_->StartFetchingTokens();
+  service()->StartFetchingTokens();
   // You have to call delegates by hand with the test fetcher,
   // Let's pretend only one returned.
 
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "eraseme");
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService),
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "eraseme");
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService),
             "eraseme");
 
-  service_->ResetCredentialsInMemory();
-  EXPECT_FALSE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  service()->ResetCredentialsInMemory();
+  EXPECT_FALSE(service()->HasTokenForService(GaiaConstants::kSyncService));
 
   // Now start using it again.
-  service_->UpdateCredentials(credentials_);
-  service_->StartFetchingTokens();
+  UpdateCredentialsOnService();
+  service()->StartFetchingTokens();
 
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
 
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), "token");
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService),
+            "token");
 }
 
 TEST_F(TokenServiceTest, FullIntegration) {
@@ -288,17 +264,17 @@ TEST_F(TokenServiceTest, FullIntegration) {
   {
     MockURLFetcherFactory<MockFetcher> factory;
     factory.set_results(result);
-    EXPECT_FALSE(service_->HasTokenForService(GaiaConstants::kSyncService));
-    service_->StartFetchingTokens();
+    EXPECT_FALSE(service()->HasTokenForService(GaiaConstants::kSyncService));
+    service()->StartFetchingTokens();
   }
 
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
   // Gaia returns the entire result as the token so while this is a shared
   // result with ClientLogin, it doesn't matter, we should still get it back.
-  EXPECT_EQ(service_->GetTokenForService(GaiaConstants::kSyncService), result);
+  EXPECT_EQ(service()->GetTokenForService(GaiaConstants::kSyncService), result);
 
-  service_->ResetCredentialsInMemory();
-  EXPECT_FALSE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  service()->ResetCredentialsInMemory();
+  EXPECT_FALSE(service()->HasTokenForService(GaiaConstants::kSyncService));
 }
 
 TEST_F(TokenServiceTest, LoadTokensIntoMemoryBasic) {
@@ -306,11 +282,11 @@ TEST_F(TokenServiceTest, LoadTokensIntoMemoryBasic) {
   std::map<std::string, std::string> db_tokens;
   std::map<std::string, std::string> memory_tokens;
 
-  EXPECT_FALSE(service_->TokensLoadedFromDB());
-  service_->LoadTokensIntoMemory(db_tokens, &memory_tokens);
+  EXPECT_FALSE(service()->TokensLoadedFromDB());
+  service()->LoadTokensIntoMemory(db_tokens, &memory_tokens);
   EXPECT_TRUE(db_tokens.empty());
   EXPECT_TRUE(memory_tokens.empty());
-  EXPECT_EQ(0U, success_tracker_.size());
+  EXPECT_EQ(0U, success_tracker()->size());
 
   std::vector<std::string> services;
   TokenService::GetServiceNames(&services);
@@ -331,80 +307,80 @@ TEST_F(TokenServiceTest, LoadTokensIntoMemoryAdvanced) {
 
   db_tokens["ignore"] = "token";
 
-  service_->LoadTokensIntoMemory(db_tokens, &memory_tokens);
+  service()->LoadTokensIntoMemory(db_tokens, &memory_tokens);
   EXPECT_TRUE(memory_tokens.empty());
   db_tokens[GaiaConstants::kSyncService] = "pepper";
 
-  service_->LoadTokensIntoMemory(db_tokens, &memory_tokens);
+  service()->LoadTokensIntoMemory(db_tokens, &memory_tokens);
   EXPECT_EQ(1U, memory_tokens.count(GaiaConstants::kSyncService));
   EXPECT_EQ(memory_tokens[GaiaConstants::kSyncService], "pepper");
-  EXPECT_EQ(1U, success_tracker_.size());
-  success_tracker_.Reset();
+  EXPECT_EQ(1U, success_tracker()->size());
+  success_tracker()->Reset();
 
   // SyncService token is already in memory. Pretend we got it off
   // the disk as well, but an older token.
   db_tokens[GaiaConstants::kSyncService] = "ignoreme";
-  service_->LoadTokensIntoMemory(db_tokens, &memory_tokens);
+  service()->LoadTokensIntoMemory(db_tokens, &memory_tokens);
 
   EXPECT_EQ(1U, memory_tokens.size());
-  EXPECT_EQ(0U, success_tracker_.size());
+  EXPECT_EQ(0U, success_tracker()->size());
   EXPECT_EQ(1U, memory_tokens.count(GaiaConstants::kSyncService));
   EXPECT_EQ(memory_tokens[GaiaConstants::kSyncService], "pepper");
 }
 
 TEST_F(TokenServiceTest, WebDBLoadIntegration) {
-  service_->LoadTokensFromDB();
-  WaitForDBLoadCompletion();
-  EXPECT_TRUE(service_->TokensLoadedFromDB());
-  EXPECT_EQ(0U, success_tracker_.size());
+  service()->LoadTokensFromDB();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(service()->TokensLoadedFromDB());
+  EXPECT_EQ(0U, success_tracker()->size());
 
   // Should result in DB write.
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
-  EXPECT_EQ(1U, success_tracker_.size());
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  EXPECT_EQ(1U, success_tracker()->size());
 
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
   // Clean slate.
-  service_->ResetCredentialsInMemory();
-  success_tracker_.Reset();
-  EXPECT_FALSE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  service()->ResetCredentialsInMemory();
+  success_tracker()->Reset();
+  EXPECT_FALSE(service()->HasTokenForService(GaiaConstants::kSyncService));
 
-  service_->LoadTokensFromDB();
-  WaitForDBLoadCompletion();
+  service()->LoadTokensFromDB();
+  base::RunLoop().RunUntilIdle();
 
-  EXPECT_EQ(1U, success_tracker_.size());
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(1U, success_tracker()->size());
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
 }
 
 TEST_F(TokenServiceTest, MultipleLoadResetIntegration) {
   // Should result in DB write.
-  service_->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
-  service_->ResetCredentialsInMemory();
-  success_tracker_.Reset();
-  EXPECT_FALSE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  service()->OnIssueAuthTokenSuccess(GaiaConstants::kSyncService, "token");
+  service()->ResetCredentialsInMemory();
+  success_tracker()->Reset();
+  EXPECT_FALSE(service()->HasTokenForService(GaiaConstants::kSyncService));
 
-  EXPECT_FALSE(service_->TokensLoadedFromDB());
-  service_->LoadTokensFromDB();
-  WaitForDBLoadCompletion();
-  EXPECT_TRUE(service_->TokensLoadedFromDB());
+  EXPECT_FALSE(service()->TokensLoadedFromDB());
+  service()->LoadTokensFromDB();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(service()->TokensLoadedFromDB());
 
-  service_->LoadTokensFromDB();  // Should do nothing.
-  WaitForDBLoadCompletion();
-  EXPECT_TRUE(service_->TokensLoadedFromDB());
+  service()->LoadTokensFromDB();  // Should do nothing.
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(service()->TokensLoadedFromDB());
 
-  EXPECT_EQ(1U, success_tracker_.size());
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(1U, success_tracker()->size());
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
 
   // Reset it one more time so there's no surprises.
-  service_->ResetCredentialsInMemory();
-  EXPECT_FALSE(service_->TokensLoadedFromDB());
-  success_tracker_.Reset();
+  service()->ResetCredentialsInMemory();
+  EXPECT_FALSE(service()->TokensLoadedFromDB());
+  success_tracker()->Reset();
 
-  service_->LoadTokensFromDB();
-  WaitForDBLoadCompletion();
-  EXPECT_TRUE(service_->TokensLoadedFromDB());
+  service()->LoadTokensFromDB();
+  base::RunLoop().RunUntilIdle();
+  EXPECT_TRUE(service()->TokensLoadedFromDB());
 
-  EXPECT_EQ(1U, success_tracker_.size());
-  EXPECT_TRUE(service_->HasTokenForService(GaiaConstants::kSyncService));
+  EXPECT_EQ(1U, success_tracker()->size());
+  EXPECT_TRUE(service()->HasTokenForService(GaiaConstants::kSyncService));
 }
 
 #ifndef NDEBUG
@@ -415,14 +391,14 @@ class TokenServiceCommandLineTest : public TokenServiceTestHarness {
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kSetToken, "my_service:my_value");
     TokenServiceTestHarness::SetUp();
-    service_->UpdateCredentials(credentials_);
+    UpdateCredentialsOnService();
 
     *CommandLine::ForCurrentProcess() = original_cl;
   }
 };
 
 TEST_F(TokenServiceCommandLineTest, TestValueOverride) {
-  EXPECT_TRUE(service_->HasTokenForService("my_service"));
-  EXPECT_EQ("my_value", service_->GetTokenForService("my_service"));
+  EXPECT_TRUE(service()->HasTokenForService("my_service"));
+  EXPECT_EQ("my_value", service()->GetTokenForService("my_service"));
 }
 #endif   // ifndef NDEBUG