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

Unified Diff: chrome/browser/media_galleries/media_folder_finder_unittest.cc

Issue 409743003: Use content::RunBlockingPoolTask() in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 3 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/media_galleries/media_folder_finder_unittest.cc
diff --git a/chrome/browser/media_galleries/media_folder_finder_unittest.cc b/chrome/browser/media_galleries/media_folder_finder_unittest.cc
index 8c08d821f97857426e5ec1072953f7ad0826ea8f..b994956bfdbd671f2e2c37b82d1afdd63568782b 100644
--- a/chrome/browser/media_galleries/media_folder_finder_unittest.cc
+++ b/chrome/browser/media_galleries/media_folder_finder_unittest.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
-#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/test/scoped_path_override.h"
#include "base/threading/sequenced_worker_pool.h"
@@ -19,7 +18,7 @@
#include "chrome/common/chrome_paths.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/test_browser_thread_bundle.h"
-
+#include "content/public/test/test_utils.h"
class MediaFolderFinderTest : public testing::Test {
public:
@@ -136,14 +135,9 @@ class MediaFolderFinderTest : public testing::Test {
}
}
- void RunLoop() {
- base::RunLoop().RunUntilIdle();
- content::BrowserThread::GetBlockingPool()->FlushForTesting();
- }
-
void RunLoopUntilReceivedCallback() {
while (!received_results())
- RunLoop();
+ content::RunAllBlockingPoolTasksUntilIdle();
}
private:
@@ -210,7 +204,7 @@ TEST_F(MediaFolderFinderTest, ScanAndCancel) {
CreateMediaFolderFinder(folders, false, expected_results);
StartScan();
DeleteMediaFolderFinder();
- RunLoop();
+ content::RunAllBlockingPoolTasksUntilIdle();
EXPECT_TRUE(received_results());
}

Powered by Google App Engine
This is Rietveld 408576698