Use content::RunBlockingPoolTask() in tests.

chrome/browser/sessions/session_service_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/sessions/session_service_test_helper.h"
 
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "components/sessions/serialized_navigation_entry_test_helper.h"
 #include "components/sessions/session_id.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Time;
 
 SessionServiceTestHelper::SessionServiceTestHelper() {}
 
 SessionServiceTestHelper::SessionServiceTestHelper(SessionService* service)
     : service_(service) {}
 
 SessionServiceTestHelper::~SessionServiceTestHelper() {}
@@ skipping 32 matching lines @@
 void SessionServiceTestHelper::ReadWindows(
     std::vector<SessionWindow*>* windows,
     SessionID::id_type* active_window_id) {
   Time last_time;
   ScopedVector<SessionCommand> read_commands;
   backend()->ReadLastSessionCommandsImpl(&(read_commands.get()));
   service()->RestoreSessionFromCommands(
       read_commands.get(), windows, active_window_id);
 }
 
-void SessionServiceTestHelper::AssertTabEquals(SessionID& window_id,
-                                               SessionID& tab_id,
+void SessionServiceTestHelper::AssertTabEquals(const SessionID& window_id,
+                                               const SessionID& tab_id,
                                                int visual_index,
                                                int nav_index,
                                                size_t nav_count,
                                                const SessionTab& session_tab) {
   EXPECT_EQ(window_id.id(), session_tab.window_id.id());
   EXPECT_EQ(tab_id.id(), session_tab.tab_id.id());
   AssertTabEquals(visual_index, nav_index, nav_count, session_tab);
 }
 
 void SessionServiceTestHelper::AssertTabEquals(
@@ skipping 23 matching lines @@
   EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size());
 }
 
 SessionBackend* SessionServiceTestHelper::backend() {
   return service_->backend();
 }
 
 void SessionServiceTestHelper::SetService(SessionService* service) {
   service_.reset(service);
   // Execute IO tasks posted by the SessionService.
-  content::BrowserThread::GetBlockingPool()->FlushForTesting();
+  content::RunAllBlockingPoolTasksUntilIdle();
 }
 
 void SessionServiceTestHelper::RunTaskOnBackendThread(
     const tracked_objects::Location& from_here,
     const base::Closure& task) {
   service_->RunTaskOnBackendThread(from_here, task);
 }