Upstream RunBlockingPoolTask().

chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc

Index: chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
index 40d1fb6ddc3864161e400985b6d04aeddbd1b602..47f29225382fbffb2eb864fc5456272923437cfe 100644
--- a/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/create_directory_operation_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/drive/file_system/create_directory_operation.h"
 
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
+#include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -46,7 +47,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       true, // is_exclusive
       false,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_OK, FindDirectory(kNewDirectory1));
   EXPECT_EQ(1U, observer()->get_changed_files().size());
@@ -72,7 +73,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       true, // is_exclusive
       false,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, FindDirectory(kNewDirectory2));
 
@@ -81,7 +82,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       true, // is_exclusive
       true,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_OK, FindDirectory(kNewDirectory2));
 
@@ -91,7 +92,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       true, // is_exclusive
       false,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_EXISTS, error);
 
   operation.CreateDirectory(
@@ -99,7 +100,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       false, // is_exclusive
       false,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
 
   // Try to create a directory with a path for an existing file.
@@ -108,7 +109,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       false, // is_exclusive
       true,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY, error);
 
   // Try to create a directory under a file.
@@ -117,7 +118,7 @@ TEST_F(CreateDirectoryOperationTest, CreateDirectory) {
       false, // is_exclusive
       true,  // is_recursive
       google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_A_DIRECTORY, error);
 }