Use content::RunBlockingPoolTask() in tests.

chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

 // Copyright 2014 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 <algorithm>
 #include <stack>
 
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/sync_file_system/drive_backend/sync_worker.h"
 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"
 #include "chrome/browser/sync_file_system/local/local_file_sync_service.h"
 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
 #include "chrome/browser/sync_file_system/sync_file_system_test_util.h"
 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
 #include "extensions/common/extension.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 
 #define FPL(a) FILE_PATH_LITERAL(a)
 
@@ skipping 103 matching lines @@
       delete itr->second;
     }
     file_systems_.clear();
 
     local_sync_service_->Shutdown();
 
     fake_drive_service_helper_.reset();
     local_sync_service_.reset();
     remote_sync_service_.reset();
 
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
+    content::RunAllBlockingPoolTasksUntilIdle();
     RevokeSyncableFileSystem();
   }
 
   virtual void OnRemoteChangeQueueUpdated(int64 pending_changes_hint) OVERRIDE {
     pending_remote_changes_ = pending_changes_hint;
   }
 
   virtual void OnLocalChangeAvailable(int64 pending_changes_hint) OVERRIDE {
     pending_local_changes_ = pending_changes_hint;
   }
@@ skipping 185 matching lines @@
         return local_sync_status;
 
       remote_sync_status = ProcessRemoteChange();
       if (remote_sync_status != SYNC_STATUS_OK &&
           remote_sync_status != SYNC_STATUS_NO_CHANGE_TO_SYNC &&
           remote_sync_status != SYNC_STATUS_FILE_BUSY)
         return remote_sync_status;
 
       if (local_sync_status == SYNC_STATUS_NO_CHANGE_TO_SYNC &&
           remote_sync_status == SYNC_STATUS_NO_CHANGE_TO_SYNC) {
-
         {
           base::RunLoop run_loop;
           remote_sync_service_->PromoteDemotedChanges(run_loop.QuitClosure());
           run_loop.Run();
         }
 
         {
           base::RunLoop run_loop;
           local_sync_service_->PromoteDemotedChanges(run_loop.QuitClosure());
           run_loop.Run();
@@ skipping 1349 matching lines @@
 
   EXPECT_EQ(1u, CountApp());
   EXPECT_EQ(1u, CountLocalFile(app_id));
 
   EXPECT_EQ(2u, CountMetadata());
   EXPECT_EQ(2u, CountTracker());
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system