Upstream RunBlockingPoolTask().

chrome/browser/extensions/api/file_handlers/mime_util_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/extensions/api/file_handlers/mime_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_file_system_context.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 namespace app_file_handler_util {
 namespace {
 
 const char kOrigin[] = "chrome-extension://cmalghjoncmjoeakimpfhojhpgemgaje";
 const char kJPEGExtensionFilePath[] = "/fake/path/foo.jpg";
 const char kJPEGExtensionUpperCaseFilePath[] = "/fake/path/FOO.JPG";
 
@@ skipping 41 matching lines @@
   base::FilePath html_mime_file_path_;
 };
 
 TEST_F(FileHandlersMimeUtilTest, GetMimeTypeForLocalPath) {
   {
     std::string result;
     GetMimeTypeForLocalPath(
         &profile_,
         base::FilePath::FromUTF8Unsafe(kJPEGExtensionFilePath),
         base::Bind(&OnMimeTypeResult, &result));
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
+    content::RunAllBlockingPoolTasksUntilIdle();
     EXPECT_EQ("image/jpeg", result);
   }
 
   {
     std::string result;
     GetMimeTypeForLocalPath(
         &profile_,
         base::FilePath::FromUTF8Unsafe(kJPEGExtensionUpperCaseFilePath),
         base::Bind(&OnMimeTypeResult, &result));
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
+    content::RunAllBlockingPoolTasksUntilIdle();
     EXPECT_EQ("image/jpeg", result);
   }
 
   {
     std::string result;
     GetMimeTypeForLocalPath(&profile_,
                             html_mime_file_path_,
                             base::Bind(&OnMimeTypeResult, &result));
-
-    // Since there are two calls to the blocking pool, it has to be flushed
-    // twice.
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
-
+    content::RunAllBlockingPoolTasksUntilIdle();
     EXPECT_EQ("text/html", result);
   }
 }
 
 TEST_F(FileHandlersMimeUtilTest, MimeTypeCollector_ForURLs) {
   MimeTypeCollector collector(&profile_);
 
   std::vector<fileapi::FileSystemURL> urls;
   urls.push_back(CreateNativeLocalFileSystemURL(
       file_system_context_,
       base::FilePath::FromUTF8Unsafe(kJPEGExtensionFilePath)));
   urls.push_back(CreateNativeLocalFileSystemURL(
       file_system_context_,
       base::FilePath::FromUTF8Unsafe(kJPEGExtensionUpperCaseFilePath)));
   urls.push_back(CreateNativeLocalFileSystemURL(file_system_context_,
                                                 html_mime_file_path_));
 
   std::vector<std::string> result;
   collector.CollectForURLs(urls, base::Bind(&OnMimeTypesCollected, &result));
-
-  // Each URL may do up to 2 calls to the blocking pool. Hence, we need to
-  // flush it at least 6 times. This is unelegant, but there seem to be no
-  // better way.
-  for (int i = 0; i < 6; ++i) {
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
-  }
+  content::RunAllBlockingPoolTasksUntilIdle();
 
   ASSERT_EQ(3u, result.size());
   EXPECT_EQ("image/jpeg", result[0]);
   EXPECT_EQ("image/jpeg", result[1]);
   EXPECT_EQ("text/html", result[2]);
 }
 
 TEST_F(FileHandlersMimeUtilTest, MimeTypeCollector_ForLocalPaths) {
   MimeTypeCollector collector(&profile_);
 
   std::vector<base::FilePath> local_paths;
   local_paths.push_back(base::FilePath::FromUTF8Unsafe(kJPEGExtensionFilePath));
   local_paths.push_back(
       base::FilePath::FromUTF8Unsafe(kJPEGExtensionUpperCaseFilePath));
   local_paths.push_back(html_mime_file_path_);
 
   std::vector<std::string> result;
   collector.CollectForLocalPaths(local_paths,
                                  base::Bind(&OnMimeTypesCollected, &result));
-
-  for (int i = 0; i < 6; ++i) {
-    content::BrowserThread::GetBlockingPool()->FlushForTesting();
-    base::RunLoop().RunUntilIdle();
-  }
+  content::RunAllBlockingPoolTasksUntilIdle();
 
   ASSERT_EQ(3u, result.size());
   EXPECT_EQ("image/jpeg", result[0]);
   EXPECT_EQ("image/jpeg", result[1]);
   EXPECT_EQ("text/html", result[2]);
 }
 
 }  // namespace app_file_handler_util
 }  // namespace extensions