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

Unified Diff: chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.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/drive/file_system/get_file_for_saving_operation_unittest.cc
diff --git a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
index 8455cef37cb8147ada9d06059739b73fdc88c239..2d755b360db082781c9cb42794435f2ce433f8d7 100644
--- a/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_system/get_file_for_saving_operation_unittest.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/chromeos/drive/file_errors.h"
#include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"
#include "chrome/browser/chromeos/drive/file_write_watcher.h"
+#include "content/public/test/test_utils.h"
#include "google_apis/drive/test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -84,7 +85,7 @@ TEST_F(GetFileForSavingOperationTest, GetFileForSaving_Exist) {
drive_path,
google_apis::test_util::CreateCopyResultCallback(
&error, &local_path, &entry));
- test_util::RunBlockingPoolTask();
+ content::RunAllBlockingPoolTasksUntilIdle();
// Checks that the file is retrieved.
EXPECT_EQ(FILE_ERROR_OK, error);
@@ -119,7 +120,7 @@ TEST_F(GetFileForSavingOperationTest, GetFileForSaving_NotExist) {
drive_path,
google_apis::test_util::CreateCopyResultCallback(
&error, &local_path, &entry));
- test_util::RunBlockingPoolTask();
+ content::RunAllBlockingPoolTasksUntilIdle();
// Checks that the file is created and retrieved.
EXPECT_EQ(FILE_ERROR_OK, error);
@@ -143,7 +144,7 @@ TEST_F(GetFileForSavingOperationTest, GetFileForSaving_Directory) {
drive_path,
google_apis::test_util::CreateCopyResultCallback(
&error, &local_path, &entry));
- test_util::RunBlockingPoolTask();
+ content::RunAllBlockingPoolTasksUntilIdle();
// Checks that an error is returned.
EXPECT_EQ(FILE_ERROR_EXISTS, error);

Powered by Google App Engine
This is Rietveld 408576698