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

Unified Diff: chrome/browser/downgrade/user_data_downgrade_browsertest.cc

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)
Patch Set: ready for review Created 3 years, 8 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/downgrade/user_data_downgrade_browsertest.cc
diff --git a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
index a395463383230169fa86c29340f779b97d64cff3..dbab5a47a45d95d655867b2377316727bd1b48c9 100644
--- a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
+++ b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
@@ -9,6 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/test/test_reg_util_win.h"
#include "base/threading/sequenced_worker_pool.h"
+#include "base/threading/thread_restrictions.h"
#include "base/version.h"
#include "base/win/registry.h"
#include "chrome/common/chrome_constants.h"
@@ -115,6 +116,7 @@ class UserDataDowngradeBrowserNoMSITest
// Verify the user data directory has been renamed and created again after
// downgrade.
IN_PROC_BROWSER_TEST_F(UserDataDowngradeBrowserCopyAndCleanTest, Test) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
content::BrowserThread::GetBlockingPool()->FlushForTesting();
EXPECT_EQ(chrome::kChromeVersion, GetLastVersion(user_data_dir_).GetString());
ASSERT_FALSE(base::PathExists(other_file_));
@@ -122,12 +124,14 @@ IN_PROC_BROWSER_TEST_F(UserDataDowngradeBrowserCopyAndCleanTest, Test) {
// Verify the user data directory will not be reset without downgrade.
IN_PROC_BROWSER_TEST_F(UserDataDowngradeBrowserNoResetTest, Test) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
EXPECT_EQ(chrome::kChromeVersion, GetLastVersion(user_data_dir_).GetString());
ASSERT_TRUE(base::PathExists(other_file_));
}
// Verify the "Last Version" file won't be created for non-msi install.
IN_PROC_BROWSER_TEST_F(UserDataDowngradeBrowserNoMSITest, Test) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
ASSERT_FALSE(base::PathExists(last_version_file_path_));
ASSERT_TRUE(base::PathExists(other_file_));
}
« no previous file with comments | « chrome/browser/devtools/devtools_sanity_browsertest.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698