Use content::RunBlockingPoolTask() in tests.

chrome/browser/chromeos/settings/device_settings_test_helper.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/settings/device_settings_test_helper.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/ownership/mock_owner_key_util.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_utils.h"
 
 namespace chromeos {
 
 DeviceSettingsTestHelper::DeviceSettingsTestHelper() {}
 
 DeviceSettingsTestHelper::~DeviceSettingsTestHelper() {}
 
-void DeviceSettingsTestHelper::FlushLoops() {
-  // DeviceSettingsService may trigger operations that hop back and forth
-  // between the message loop and the blocking pool. 2 iterations are currently
-  // sufficient (key loading, signing).
-  for (int i = 0; i < 2; ++i) {
-    base::MessageLoop::current()->RunUntilIdle();
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-  }
-  base::MessageLoop::current()->RunUntilIdle();
-}
-
 void DeviceSettingsTestHelper::FlushStore() {
   std::vector<StorePolicyCallback> callbacks;
   callbacks.swap(device_policy_.store_callbacks_);
   for (std::vector<StorePolicyCallback>::iterator cb(callbacks.begin());
        cb != callbacks.end(); ++cb) {
     cb->Run(device_policy_.store_result_);
   }
 
   std::map<std::string, PolicyState>::iterator device_local_account_state;
   for (device_local_account_state = device_local_account_policy_.begin();
@@ skipping 23 matching lines @@
     callbacks.swap(device_local_account_state->second.retrieve_callbacks_);
     for (std::vector<RetrievePolicyCallback>::iterator cb(callbacks.begin());
          cb != callbacks.end(); ++cb) {
       cb->Run(device_local_account_state->second.policy_blob_);
     }
   }
 }
 
 void DeviceSettingsTestHelper::Flush() {
   do {
-    FlushLoops();
+    content::RunAllBlockingPoolTasksUntilIdle();
     FlushStore();
-    FlushLoops();
+    content::RunAllBlockingPoolTasksUntilIdle();
     FlushRetrieve();
-    FlushLoops();
+    content::RunAllBlockingPoolTasksUntilIdle();
   } while (HasPendingOperations());
 }
 
 bool DeviceSettingsTestHelper::HasPendingOperations() const {
   if (device_policy_.HasPendingOperations())
     return true;
 
   std::map<std::string, PolicyState>::const_iterator device_local_account_state;
   for (device_local_account_state = device_local_account_policy_.begin();
        device_local_account_state != device_local_account_policy_.end();
@@ skipping 164 matching lines @@
                                                             profile_.get());
   }
   OwnerSettingsService* service =
       OwnerSettingsServiceFactory::GetForProfile(profile_.get());
   CHECK(service);
   if (tpm_is_ready)
     service->OnTPMTokenReady();
 }
 
 }  // namespace chromeos