Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3544)

Unified Diff: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

Issue 380993002: Upstream RunBlockingPoolTask(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
index 77eccc234c1a8845240dea9ccf4585515ff5e09f..d4b6ef64bcd63f5685de995255620de92edf97ca 100644
--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
@@ -10,7 +10,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/drive/test_util.h"
#include "chrome/browser/chromeos/file_manager/drive_test_util.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
#include "chrome/browser/chromeos/login/users/user_manager.h"
@@ -577,7 +576,7 @@ class MultiProfileDriveFileSystemExtensionApiTest :
"application/vnd.google-apps.document", "",
resource_ids_["test_dir"], "hosted_doc", true,
google_apis::test_util::CreateCopyResultCallback(&error, &entry));
- drive::test_util::RunBlockingPoolTask();
+ content::RunAllBlockingPoolTasksUntilIdle();
if (error != google_apis::HTTP_CREATED)
return false;
@@ -588,7 +587,7 @@ class MultiProfileDriveFileSystemExtensionApiTest :
kResourceId,
"application/vnd.google-apps.document", "", "", "hosted_doc", true,
google_apis::test_util::CreateCopyResultCallback(&error, &entry));
- drive::test_util::RunBlockingPoolTask();
+ content::RunAllBlockingPoolTasksUntilIdle();
return (error == google_apis::HTTP_CREATED);
}

Powered by Google App Engine
This is Rietveld 408576698