Upstream RunBlockingPoolTask().

chrome/browser/chromeos/drive/write_on_cache_file_unittest.cc

 // Copyright 2013 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/drive/write_on_cache_file.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/drive/dummy_file_system.h"
-#include "chrome/browser/chromeos/drive/test_util.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
+#include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace drive {
 
 namespace {
 
 const base::FilePath::CharType kDrivePath[] =
     FILE_PATH_LITERAL("drive/root/file.txt");
 const base::FilePath::CharType kInvalidPath[] =
     FILE_PATH_LITERAL("drive/invalid/path");
@@ skipping 42 matching lines @@
   TestFileSystem test_file_system;
 
   FileError error = FILE_ERROR_FAILED;
   base::FilePath path;
   // The file should successfully be opened.
   WriteOnCacheFile(
       &test_file_system,
       base::FilePath(kDrivePath),
       std::string(),  // mime_type
       google_apis::test_util::CreateCopyResultCallback(&error, &path));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(kLocalPath, path.value());
 
   // Make sure that the file is actually closed.
   EXPECT_EQ(1, test_file_system.num_closed());
 }
 
 TEST(WriteOnCacheFileTest, PrepareFileForWritingCreateFail) {
   content::TestBrowserThreadBundle thread_bundle;
   TestFileSystem test_file_system;
 
   FileError error = FILE_ERROR_FAILED;
   base::FilePath path;
   // Access to kInvalidPath should fail, and FileWriteHelper should not try to
   // open or close the file.
   WriteOnCacheFile(
       &test_file_system,
       base::FilePath(kInvalidPath),
       std::string(),  // mime_type
       google_apis::test_util::CreateCopyResultCallback(&error, &path));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
 
   EXPECT_EQ(FILE_ERROR_INVALID_OPERATION, error);
   EXPECT_TRUE(path.empty());
 }
 
 }   // namespace drive