Moved JsonPrefStore to use SequencedWorkerPool

chrome/browser/chromeos/login/login_utils_browsertest.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 "chrome/browser/chromeos/login/login_utils.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 202 matching lines @@
     test_api->SetCryptohomeLibrary(cryptohome_, true);
 
     EXPECT_CALL(*mock_dbus_thread_manager_.mock_cryptohome_client(),
                 IsMounted(_));
 
     browser_process_->SetProfileManager(
         new ProfileManagerWithoutInit(scoped_temp_dir_.path()));
     connector_ = browser_process_->browser_policy_connector();
     connector_->Init();
 
-    RunAllPending();
+    RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
     cryptohome::AsyncMethodCaller::Shutdown();
     mock_async_method_caller_ = NULL;
 
-    RunAllPending();
+    RunUntilIdle();
     {
       // chrome_browser_net::Predictor usually skips its shutdown routines on
       // unit_tests, but does the full thing when
       // g_browser_process->profile_manager() is valid during initialization.
       // Run a task on a temporary BrowserThread::IO that allows skipping
       // these routines.
       //
       // It is important to not have a fake message loop on the IO
       // thread for the whole test, see comment on LoginUtilsTest
       // constructor for details.
       io_thread_.DeprecatedSetMessageLoop(&loop_);
       loop_.PostTask(FROM_HERE,
                      base::Bind(&LoginUtilsTest::TearDownOnIO,
                                 base::Unretained(this)));
-      RunAllPending();
+      RunUntilIdle();
       io_thread_.DeprecatedSetMessageLoop(NULL);
     }
 
     // These trigger some tasks that have to run while BrowserThread::UI
     // exists. Delete all the profiles before deleting the connector.
     browser_process_->SetProfileManager(NULL);
     connector_ = NULL;
     browser_process_->SetBrowserPolicyConnector(NULL);
-    RunAllPending();
+    RunUntilIdle();
   }
 
   void TearDownOnIO() {
     std::vector<Profile*> profiles =
         browser_process_->profile_manager()->GetLoadedProfiles();
     for (size_t i = 0; i < profiles.size(); ++i) {
       chrome_browser_net::Predictor* predictor =
           profiles[i]->GetNetworkPredictor();
       if (predictor) {
         predictor->EnablePredictorOnIOThread(false);
         predictor->Shutdown();
       }
     }
   }
 
-  void RunAllPending() {
-    loop_.RunAllPending();
+  void RunUntilIdle() {
+    loop_.RunUntilIdle();
     BrowserThread::GetBlockingPool()->FlushForTesting();
-    loop_.RunAllPending();
+    loop_.RunUntilIdle();
   }
 
   virtual void OnProfilePrepared(Profile* profile) OVERRIDE {
     EXPECT_FALSE(prepared_profile_);
     prepared_profile_ = profile;
   }
 
   virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE {
     FAIL() << "OnLoginFailure not expected";
   }
 
   virtual void OnLoginSuccess(const std::string& username,
                               const std::string& password,
                               bool pending_requests,
                               bool using_oauth) OVERRIDE {
     FAIL() << "OnLoginSuccess not expected";
   }
 
   void LockDevice(const std::string& username) {
     EXPECT_CALL(*cryptohome_, InstallAttributesIsFirstInstall())
         .WillOnce(Return(true))
         .WillRepeatedly(Return(false));
     policy::CloudPolicyDataStore* device_data_store =
         connector_->GetDeviceCloudPolicyDataStore();
     device_data_store->set_device_mode(policy::DEVICE_MODE_ENTERPRISE);
     device_data_store->set_device_id(kDeviceId);
     EXPECT_EQ(policy::EnterpriseInstallAttributes::LOCK_SUCCESS,
               connector_->LockDevice(username));
-    RunAllPending();
+    RunUntilIdle();
   }
 
   void PrepareProfile(const std::string& username) {
     ScopedDeviceSettingsTestHelper device_settings_test_helper;
     MockSessionManagerClient* session_manager_client =
         mock_dbus_thread_manager_.mock_session_manager_client();
     EXPECT_CALL(*session_manager_client, StartSession(_));
     EXPECT_CALL(*cryptohome_, GetSystemSalt())
         .WillRepeatedly(Return(std::string("stub_system_salt")));
     EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
         .WillRepeatedly(Return());
 
     scoped_refptr<Authenticator> authenticator =
         LoginUtils::Get()->CreateAuthenticator(this);
     authenticator->CompleteLogin(ProfileManager::GetDefaultProfile(),
                                  username,
                                  "password");
 
     const bool kPendingRequests = false;
     const bool kUsingOAuth = true;
     const bool kHasCookies = true;
     LoginUtils::Get()->PrepareProfile(username, std::string(), "password",
                                       kPendingRequests, kUsingOAuth,
                                       kHasCookies, this);
     device_settings_test_helper.Flush();
-    RunAllPending();
+    RunUntilIdle();
   }
 
   net::TestURLFetcher* PrepareOAuthFetcher(const std::string& expected_url) {
     net::TestURLFetcher* fetcher = test_url_fetcher_factory_.GetFetcherByID(0);
     EXPECT_TRUE(fetcher);
     EXPECT_TRUE(fetcher->delegate());
     EXPECT_TRUE(StartsWithASCII(fetcher->GetOriginalURL().spec(),
                                 expected_url,
                                 true));
     fetcher->set_url(fetcher->GetOriginalURL());
@@ skipping 131 matching lines @@
 
   // 2. Get the pending oauth1 access token fetcher.
   net::TestURLFetcher* fetcher =
       PrepareOAuthFetcher(GaiaUrls::GetInstance()->get_oauth_token_url());
   ASSERT_TRUE(fetcher);
 
   // 3. Issuing a RefreshPolicies() now blocks waiting for the oauth token.
   bool refresh_policies_completed = false;
   browser_process_->policy_service()->RefreshPolicies(
       base::Bind(SetFlag, &refresh_policies_completed));
-  RunAllPending();
+  RunUntilIdle();
   ASSERT_FALSE(refresh_policies_completed);
 
   // 4. Now make the fetcher fail. RefreshPolicies() should unblock.
   // The OAuth1TokenFetcher retries up to 5 times with a 3 second delay;
   // just invoke the callback directly to avoid waiting for that.
   // The |mock_fetcher| is passed instead of the original because the original
   // is deleted by the GaiaOAuthFetcher after the first callback.
   net::URLFetcherDelegate* delegate = fetcher->delegate();
   ASSERT_TRUE(delegate);
   net::TestURLFetcher mock_fetcher(fetcher->id(),
                                    fetcher->GetOriginalURL(),
                                    delegate);
   mock_fetcher.set_status(net::URLRequestStatus());
   mock_fetcher.set_response_code(404);
   for (int i = 0; i < 6; ++i) {
     ASSERT_FALSE(refresh_policies_completed);
     delegate->OnURLFetchComplete(&mock_fetcher);
-    RunAllPending();
+    RunUntilIdle();
   }
   EXPECT_TRUE(refresh_policies_completed);
 }
 
 TEST_P(LoginUtilsBlockingLoginTest, EnterpriseLoginBlocksForEnterpriseUser) {
   UserManager* user_manager = UserManager::Get();
   ASSERT_TRUE(!user_manager->IsUserLoggedIn());
   EXPECT_FALSE(connector_->IsEnterpriseManaged());
   EXPECT_FALSE(prepared_profile_);
 
@@ skipping 39 matching lines @@
     if (steps < 3) break;
 
     // Fake OAuth service token retrieval:
     fetcher = PrepareOAuthFetcher(gaia_urls->oauth_wrap_bridge_url());
     ASSERT_TRUE(fetcher);
     fetcher->SetResponseString(kOAuthServiceTokenData);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 
     // The cloud policy subsystem is now ready to fetch the dmtoken and the user
     // policy.
-    RunAllPending();
+    RunUntilIdle();
     if (steps < 4) break;
 
     fetcher = PrepareDMRegisterFetcher();
     ASSERT_TRUE(fetcher);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
     // The policy fetch job has now been scheduled, run it:
-    RunAllPending();
+    RunUntilIdle();
     if (steps < 5) break;
 
     // Verify that there is no profile prepared just before the policy fetch.
     EXPECT_FALSE(prepared_profile_);
 
     fetcher = PrepareDMPolicyFetcher();
     ASSERT_TRUE(fetcher);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   } while (0);
 
@@ skipping 15 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(
     LoginUtilsBlockingLoginTestInstance,
     LoginUtilsBlockingLoginTest,
     testing::Values(0, 1, 2, 3, 4, 5));
 
 }  // namespace
 
 }