Upstream RunBlockingPoolTask().

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

Index: chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
index 44d4848a5067982f288955583b60b07e31bc2e6b..e2b050bebfa84716b731d9fb0201145e5071bf1b 100644
--- a/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/remove_operation_unittest.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "content/public/test/test_utils.h"
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -32,7 +33,7 @@ TEST_F(RemoveOperationTest, RemoveFile) {
   operation.Remove(file_in_root,
                    false,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, GetLocalResourceEntry(file_in_root, &entry));
 
@@ -48,7 +49,7 @@ TEST_F(RemoveOperationTest, RemoveFile) {
   operation.Remove(file_in_subdir,
                    false,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             GetLocalResourceEntry(file_in_subdir, &entry));
@@ -65,7 +66,7 @@ TEST_F(RemoveOperationTest, RemoveFile) {
   operation.Remove(nonexisting_file,
                    false,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_FOUND, error);
 
   // Verify observer notifications.
@@ -95,7 +96,7 @@ TEST_F(RemoveOperationTest, RemoveDirectory) {
   operation.Remove(empty_dir,
                    false,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             GetLocalResourceEntry(empty_dir, &entry));
@@ -106,7 +107,7 @@ TEST_F(RemoveOperationTest, RemoveDirectory) {
   operation.Remove(non_empty_dir,
                    false,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_NOT_EMPTY, error);
   EXPECT_EQ(FILE_ERROR_OK,
             GetLocalResourceEntry(non_empty_dir, &entry));
@@ -119,7 +120,7 @@ TEST_F(RemoveOperationTest, RemoveDirectory) {
   operation.Remove(non_empty_dir,
                    true,  // is_recursive
                    google_apis::test_util::CreateCopyResultCallback(&error));
-  test_util::RunBlockingPoolTask();
+  content::RunAllBlockingPoolTasksUntilIdle();
   EXPECT_EQ(FILE_ERROR_OK, error);
   EXPECT_EQ(FILE_ERROR_NOT_FOUND,
             GetLocalResourceEntry(non_empty_dir, &entry));