Use content::RunBlockingPoolTask() in tests.

chrome/browser/media_galleries/media_folder_finder_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 "chrome/browser/media_galleries/media_folder_finder.h"
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_path_override.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/media_galleries/media_scan_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-
+#include "content/public/test/test_utils.h"
 
 class MediaFolderFinderTest : public testing::Test {
  public:
   MediaFolderFinderTest() {
   }
 
   virtual ~MediaFolderFinderTest() {
   }
 
   virtual void SetUp() OVERRIDE {
@@ skipping 96 matching lines @@
       std::string dummy_data;
       dummy_data.resize(filesize);
 
       int bytes_written =
           base::WriteFile(test_file, dummy_data.c_str(), filesize);
       ASSERT_GE(bytes_written, 0);
       ASSERT_EQ(filesize, static_cast<size_t>(bytes_written));
     }
   }
 
-  void RunLoop() {
-    base::RunLoop().RunUntilIdle();
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-  }
-
   void RunLoopUntilReceivedCallback() {
     while (!received_results())
-      RunLoop();
+      content::RunAllBlockingPoolTasksUntilIdle();
   }
 
  private:
   void OnGotResults(
       bool success,
       const MediaFolderFinder::MediaFolderFinderResults& results) {
     received_results_ = true;
     EXPECT_EQ(expected_success_, success);
     std::set<base::FilePath> expected_keys =
         GetKeysFromResults(expected_results_);
@@ skipping 46 matching lines @@
   EXPECT_TRUE(received_results());
 }
 
 TEST_F(MediaFolderFinderTest, ScanAndCancel) {
   MediaFolderFinder::MediaFolderFinderResults expected_results;
   std::vector<base::FilePath> folders;
   folders.push_back(fake_dir());
   CreateMediaFolderFinder(folders, false, expected_results);
   StartScan();
   DeleteMediaFolderFinder();
-  RunLoop();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_TRUE(received_results());
 }
 
 TEST_F(MediaFolderFinderTest, ScanNothing) {
   MediaFolderFinder::MediaFolderFinderResults expected_results;
   std::vector<base::FilePath> folders;
   CreateMediaFolderFinder(folders, true, expected_results);
   StartScan();
   RunLoopUntilReceivedCallback();
   DeleteMediaFolderFinder();
@@ skipping 178 matching lines @@
 
   // |fake_home_dir| and its ancestors do not show up in results.
   expected_results.erase(fake_dir());
   expected_results.erase(fake_home_dir);
 
   CreateMediaFolderFinder(folders, true, expected_results);
   StartScan();
   RunLoopUntilReceivedCallback();
   DeleteMediaFolderFinder();
 }