Replace ScopedAllowIO with ScopedAllowBlockingForTesting in tests.
s/ThreadRestrictions::ScopedAllowIO allow_io;/
ScopedAllowBlockingForTesting allow_blocking;/
in files that have the word "test" in their path.
ThreadRestrictions::ScopedAllowIO instances that are not named
|allow_io| are not changed by this CL.
[email protected]
Bug: 766678
Change-Id: Ie809d1b39d50c1669cd36399cdfe5657cf072c21
Reviewed-on: https://chromium-review.googlesource.com/718983
Reviewed-by: François Doray <[email protected]>
Reviewed-by: Gabriel Charette <[email protected]>
Commit-Queue: François Doray <[email protected]>
Cr-Commit-Position: refs/heads/master@{#509880}diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 765b6527..e73f9f3c 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -261,7 +261,7 @@
base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
// Lock the active profile.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
Profile* profile = [ac lastProfile];
ProfileAttributesEntry* entry;
ASSERT_TRUE(g_browser_process->profile_manager()->
@@ -297,7 +297,7 @@
base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
Profile* profile = [ac lastProfile];
EXPECT_EQ(ProfileManager::GetGuestProfilePath(), profile->GetPath());
EXPECT_TRUE(profile->IsGuestSession());
@@ -332,7 +332,7 @@
// Prohibiting guest mode forces the user manager flow for About Chrome.
local_state->SetBoolean(prefs::kBrowserGuestModeEnabled, false);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
Profile* guest_profile = [ac lastProfile];
EXPECT_EQ(ProfileManager::GetGuestProfilePath(), guest_profile->GetPath());
EXPECT_TRUE(guest_profile->IsGuestSession());
@@ -545,7 +545,7 @@
BookmarkModelFactory::GetForBrowserContext(profile1));
// Create profile 2.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path2 = profile_manager->GenerateNextProfileDirectoryPath();
Profile* profile2 =
Profile::CreateProfile(path2, NULL, Profile::CREATE_MODE_SYNCHRONOUS);
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 102006cd..9da7a7ec 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -603,7 +603,7 @@
// a handler accepts "".
IN_PROC_BROWSER_TEST_F(PlatformAppWithFileBrowserTest,
LaunchWithFileEmptyExtension) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath test_file;
@@ -618,7 +618,7 @@
// a handler accepts *.
IN_PROC_BROWSER_TEST_F(PlatformAppWithFileBrowserTest,
LaunchWithFileEmptyExtensionAcceptAny) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath test_file;
@@ -727,7 +727,7 @@
// Tests that the file is created if the file does not exist and the app has the
// fileSystem.write permission.
IN_PROC_BROWSER_TEST_F(PlatformAppWithFileBrowserTest, LaunchNewFile) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
ASSERT_TRUE(RunPlatformAppTestWithFile(
diff --git a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
index 62d97be..56d253c 100644
--- a/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm
@@ -69,7 +69,7 @@
user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
base::FilePath socket_path;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
CHECK(base::ReadSymbolicLink(symlink_path, &socket_path));
app_mode::VerifySocketPermissions(socket_path);
@@ -84,7 +84,7 @@
}
TestShimClient::~TestShimClient() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
io_thread_.Stop();
}
@@ -286,7 +286,7 @@
directory_in_tmp_ = test_api.directory_in_tmp();
// Check that socket files have been created.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(directory_in_tmp_));
EXPECT_TRUE(base::PathExists(symlink_path_));
diff --git a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
index b92dfdb6..62f5aaf 100644
--- a/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
+++ b/chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -263,7 +263,7 @@
// (always) in tests. If it wasn't the case, the following test would fail
// (but flakily since the creation happens on the FILE thread).
shim_path_ = GetAppShimPath(profile(), app);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(shim_path_));
// To create a shim in a test, instead call UpdateAllShortcuts, which has been
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc
index cc0bc99..10644535 100644
--- a/chrome/browser/apps/guest_view/web_view_browsertest.cc
+++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -2596,7 +2596,7 @@
"web_view/download");
ASSERT_TRUE(guest_web_contents);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temporary_download_dir;
ASSERT_TRUE(temporary_download_dir.CreateUniqueTempDir());
DownloadPrefs::FromBrowserContext(guest_web_contents->GetBrowserContext())
@@ -2754,7 +2754,7 @@
content::WebContents* web_contents = GetFirstAppWindowWebContents();
ASSERT_TRUE(web_contents);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temporary_download_dir;
ASSERT_TRUE(temporary_download_dir.CreateUniqueTempDir());
DownloadPrefs::FromBrowserContext(web_contents->GetBrowserContext())
@@ -2840,7 +2840,7 @@
content::WebContents* web_contents = GetFirstAppWindowWebContents();
ASSERT_TRUE(web_contents);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temporary_download_dir;
ASSERT_TRUE(temporary_download_dir.CreateUniqueTempDir());
DownloadPrefs::FromBrowserContext(web_contents->GetBrowserContext())
@@ -2899,7 +2899,7 @@
DownloadHistoryWaiter history_waiter(browser_context);
history_waiter.WaitForHistoryLoad();
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temporary_download_dir;
ASSERT_TRUE(temporary_download_dir.Set(
DownloadPrefs::FromBrowserContext(browser_context)->DownloadPath()));
diff --git a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index 02fd9a3..a0f3a1e 100644
--- a/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -57,7 +57,7 @@
class BrowsingDataLocalStorageHelperTest : public InProcessBrowserTest {
protected:
void CreateLocalStorageFilesForTest() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Note: This helper depends on details of how the dom_storage library
// stores data in the host file system.
base::FilePath storage_path = GetLocalStoragePathForTestingProfile();
@@ -131,7 +131,7 @@
content::RunAllTasksUntilIdle();
// Ensure the file has been deleted.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FileEnumerator file_enumerator(
GetLocalStoragePathForTestingProfile(),
false,
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
index 40c0258..c7b3e17 100644
--- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -74,7 +74,7 @@
}
void DownloadAnItem() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir downloads_directory;
ASSERT_TRUE(downloads_directory.CreateUniqueTempDir());
browser()->profile()->GetPrefs()->SetFilePath(
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc
index 4e1dccf8..33e7dbc 100644
--- a/chrome/browser/chrome_service_worker_browsertest.cc
+++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -64,7 +64,7 @@
void WriteFile(const base::FilePath::StringType& filename,
base::StringPiece contents) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_EQ(base::checked_cast<int>(contents.size()),
base::WriteFile(service_worker_dir_.GetPath().Append(filename),
contents.data(), contents.size()));
diff --git a/chrome/browser/chromeos/customization/customization_document_browsertest.cc b/chrome/browser/chromeos/customization/customization_document_browsertest.cc
index 31f9908c..3f2d80e 100644
--- a/chrome/browser/chromeos/customization/customization_document_browsertest.cc
+++ b/chrome/browser/chromeos/customization/customization_document_browsertest.cc
@@ -192,7 +192,7 @@
waiter.Wait();
{
std::string resolved_locale;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
l10n_util::CheckAndResolveLocale(languages_available[i],
&resolved_locale);
EXPECT_EQ(GetExpectedLanguage(languages_available[i]), resolved_locale)
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index 93f1f135..d1ef79a 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -626,7 +626,7 @@
// Adds a new user for testing to the current session.
void AddUser(const TestAccountInfo& info, bool log_in) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
const AccountId account_id(AccountId::FromUserEmail(info.email));
if (log_in) {
session_manager::SessionManager::Get()->CreateSession(account_id,
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index f9ce113..e35aa82 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -625,7 +625,7 @@
void FileManagerBrowserTestBase::OnMessage(const std::string& name,
const base::DictionaryValue& value,
std::string* output) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (name == "getTestName") {
// Pass the test case name.
*output = GetTestCaseNameParam();
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
index 68c1c3ec..d6c96812 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -129,7 +129,7 @@
const char* sub_dir,
const wallpaper::WallpaperFilesId& wallpaper_files_id,
const std::string& id) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath wallpaper_path =
WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir,
wallpaper_files_id, id);
@@ -141,7 +141,7 @@
// Logs in |account_id|.
void LogIn(const AccountId& account_id, const std::string& user_id_hash) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
SessionManager::Get()->CreateSession(account_id, user_id_hash);
SessionManager::Get()->SessionStarted();
// Flush to ensure the created session and ACTIVE state reaches ash.
@@ -181,7 +181,7 @@
// Only needs to be called (once) by tests that want to test loading of
// default wallpapers.
void CreateCmdlineWallpapers() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
wallpaper_dir_.reset(new base::ScopedTempDir);
ASSERT_TRUE(wallpaper_dir_->CreateUniqueTempDir());
wallpaper_manager_test_utils::CreateCmdlineWallpapers(
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc
index ea077ced..6f955e67 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc
@@ -103,7 +103,7 @@
int width,
int height,
SkColor color) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::vector<unsigned char> output;
if (!CreateJPEGImage(width, height, color, &output))
return false;
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index ee23e24..4a099b2 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -592,7 +592,7 @@
const Extension* GetExtensionByPath(
const extensions::ExtensionSet& extensions,
const base::FilePath& path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath extension_path = base::MakeAbsoluteFilePath(path);
EXPECT_TRUE(!extension_path.empty());
for (const scoped_refptr<const Extension>& extension : extensions) {
diff --git a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
index dd01ede..834f197b 100644
--- a/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
+++ b/chrome/browser/downgrade/user_data_downgrade_browsertest.cc
@@ -116,7 +116,7 @@
// 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;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::TaskScheduler::GetInstance()->FlushForTesting();
EXPECT_EQ(chrome::kChromeVersion, GetLastVersion(user_data_dir_).GetString());
ASSERT_FALSE(base::PathExists(other_file_));
@@ -124,14 +124,14 @@
// Verify the user data directory will not be reset without downgrade.
IN_PROC_BROWSER_TEST_F(UserDataDowngradeBrowserNoResetTest, Test) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
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;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_FALSE(base::PathExists(last_version_file_path_));
ASSERT_TRUE(base::PathExists(other_file_));
}
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index 92b67b9..e9d9c23a 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -513,7 +513,7 @@
if (!browser)
return false;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!downloads_directory_.CreateUniqueTempDir())
return false;
@@ -642,7 +642,7 @@
bool CheckDownloadFullPaths(Browser* browser,
const base::FilePath& downloaded_file,
const base::FilePath& origin_file) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
bool origin_file_exists = base::PathExists(origin_file);
EXPECT_TRUE(origin_file_exists) << origin_file.value();
if (!origin_file_exists)
@@ -709,7 +709,7 @@
SizeTestType type,
const std::string& partial_indication,
const std::string& total_indication) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(type == SIZE_TEST_TYPE_UNKNOWN || type == SIZE_TEST_TYPE_KNOWN);
if (type != SIZE_TEST_TYPE_KNOWN && type != SIZE_TEST_TYPE_UNKNOWN)
return false;
@@ -805,7 +805,7 @@
const int64_t file_size) {
std::string file_contents;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
bool read = base::ReadFileToString(path, &file_contents);
EXPECT_TRUE(read) << "Failed reading file: " << path.value() << std::endl;
if (!read)
@@ -940,7 +940,7 @@
if (item->GetState() == content::DownloadItem::COMPLETE) {
// Clean up the file, in case it ended up in the My Documents folder.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath destination_folder = GetDownloadDirectory(browser());
base::FilePath my_downloaded_file = item->GetTargetFilePath();
EXPECT_TRUE(base::PathExists(my_downloaded_file));
@@ -1215,7 +1215,7 @@
EXPECT_EQ(1, browser()->tab_strip_model()->count());
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
base::FilePath downloaded_file(DestinationFile(browser(), file));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(content::IsFileQuarantined(downloaded_file, url, GURL()));
CheckDownload(browser(), file, file);
}
@@ -1297,7 +1297,7 @@
ui_test_utils::NavigateToURL(browser(), url);
// Check that we did not download the web page.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(file_path));
// Check state.
@@ -1397,7 +1397,7 @@
// Check that we did not download the file.
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
base::FilePath file_path(DestinationFile(browser(), file));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(file_path));
// Check state.
@@ -1496,7 +1496,7 @@
// later.
base::FilePath origin(OriginFile(base::FilePath(FILE_PATH_LITERAL(
"downloads/a_zip_file.zip"))));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(origin));
int64_t origin_file_size = 0;
EXPECT_TRUE(base::GetFileSize(origin, &origin_file_size));
@@ -2001,7 +2001,7 @@
// Confirm the downloaded data exists.
base::FilePath downloaded_file = GetDownloadDirectory(browser());
downloaded_file = downloaded_file.Append(FILE_PATH_LITERAL("a_red_dot.png"));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(downloaded_file));
}
@@ -2224,7 +2224,7 @@
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
base::ScopedTempDir other_directory;
ASSERT_TRUE(other_directory.CreateUniqueTempDir());
@@ -2261,7 +2261,7 @@
browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_TRUE(web_contents);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
base::ScopedTempDir other_directory;
ASSERT_TRUE(other_directory.CreateUniqueTempDir());
@@ -2959,7 +2959,7 @@
content::DownloadManager* manager = DownloadManagerForBrowser(browser());
base::FilePath origin_file(OriginFile(base::FilePath(FILE_PATH_LITERAL(
"downloads/a_zip_file.zip"))));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(origin_file));
std::string origin_contents;
ASSERT_TRUE(base::ReadFileToString(origin_file, &origin_contents));
@@ -2977,7 +2977,7 @@
(index == 0 ? std::string(".zip") :
base::StringPrintf(" (%d).zip", index)),
target_path.BaseName().AsUTF8Unsafe());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(target_path));
ASSERT_TRUE(VerifyFile(target_path, origin_contents,
origin_contents.size()));
@@ -3017,7 +3017,7 @@
};
std::vector<DownloadItem*> download_items;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath origin_directory =
GetDownloadDirectory(browser()).Append(FILE_PATH_LITERAL("origin"));
ASSERT_TRUE(base::CreateDirectory(origin_directory));
@@ -3122,7 +3122,7 @@
// Ensure that we have enough disk space to download the large file.
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
int64_t free_space =
base::SysInfo::AmountOfFreeDiskSpace(GetDownloadDirectory(browser()));
ASSERT_LE(parameters.size, free_space)
@@ -3155,7 +3155,7 @@
ASSERT_EQ(parameters.size, download_items[0]->GetTotalBytes());
// Delete the file.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::DieFileDie(download_items[0]->GetTargetFilePath(), false));
}
@@ -3560,7 +3560,7 @@
GetDownloads(browser(), &updated_downloads);
ASSERT_EQ(std::size_t(1), updated_downloads.size());
ASSERT_FALSE(updated_downloads[0]->IsDangerous());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathExists(updated_downloads[0]->GetTargetFilePath()));
updated_downloads[0]->Cancel(true);
}
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc
index b6842a6..387a250 100644
--- a/chrome/browser/download/save_page_browsertest.cc
+++ b/chrome/browser/download/save_page_browsertest.cc
@@ -411,7 +411,7 @@
&full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_FALSE(base::PathExists(dir));
EXPECT_TRUE(base::ContentsEqual(GetTestDirFile("a.htm"), full_file_name));
@@ -499,7 +499,7 @@
GetCurrentTab(browser())->Close();
EXPECT_EQ(DownloadItem::CANCELLED, items[0]->GetState());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(full_file_name));
EXPECT_FALSE(base::PathExists(dir));
}
@@ -517,7 +517,7 @@
&dir, &full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_FALSE(base::PathExists(dir));
EXPECT_TRUE(base::ContentsEqual(GetTestDirFile("a.htm"), full_file_name));
@@ -531,7 +531,7 @@
&full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_TRUE(base::PathExists(dir));
@@ -607,7 +607,7 @@
ASSERT_TRUE(VerifySavePackageExpectations(browser(), url));
persisted.WaitForPersisted();
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_TRUE(base::PathExists(dir));
@@ -636,7 +636,7 @@
downloads[0]->Remove();
removed.WaitForRemoved();
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_FALSE(base::PathExists(dir));
EXPECT_TRUE(base::ContentsEqual(GetTestDirFile("a.htm"), full_file_name));
@@ -654,7 +654,7 @@
download_dir.AppendASCII(std::string("test.exe") + kAppendedExtension);
base::FilePath dir = download_dir.AppendASCII("test.exe_files");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(full_file_name));
GURL url = URLRequestMockHTTPJob::GetMockUrl("save_page/c.htm");
ui_test_utils::NavigateToURL(browser(), url);
@@ -711,7 +711,7 @@
ASSERT_TRUE(VerifySavePackageExpectations(browser(), url));
persisted.WaitForPersisted();
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(full_file_name));
int64_t actual_file_size = -1;
EXPECT_TRUE(base::GetFileSize(full_file_name, &actual_file_size));
@@ -737,7 +737,7 @@
base::FilePath download_dir = DownloadPrefs::FromDownloadManager(
GetDownloadManager())->DownloadPath();
base::FilePath filename = download_dir.AppendASCII("dataurl.txt");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(filename));
std::string contents;
EXPECT_TRUE(base::ReadFileToString(filename, &contents));
@@ -757,7 +757,7 @@
"dubious-subresources", 2, &dir, &full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_TRUE(base::PathExists(dir.AppendASCII("not-a-crx.crx.download")));
}
@@ -792,7 +792,7 @@
"iframe-src-is-a-download", 3, &dir, &full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(full_file_name));
EXPECT_TRUE(base::PathExists(dir.AppendASCII("thisdayinhistory.html")));
EXPECT_TRUE(base::PathExists(dir.AppendASCII("no-such-file.html")));
@@ -804,7 +804,7 @@
GURL url = NavigateToMockURL("unauthorized-access");
// Create a test file (that the web page should not have access to).
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir2;
ASSERT_TRUE(temp_dir2.CreateUniqueTempDir());
base::FilePath file_path =
@@ -875,7 +875,7 @@
"frames-xsite-complete-html", 5, &dir, &full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::DirectoryExists(dir));
base::FilePath expected_files[] = {
full_file_name,
@@ -937,7 +937,7 @@
std::string mhtml;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::ReadFileToString(full_file_name, &mhtml));
}
@@ -1005,7 +1005,7 @@
SaveCurrentTab(url, content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML,
"frames-xsite-complete-html", 5, &dir, &full_file_name);
ASSERT_FALSE(HasFailure());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::DirectoryExists(dir));
EXPECT_TRUE(base::PathExists(full_file_name));
}
diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
index 8c7a131d..31e0aa8 100644
--- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
+++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc
@@ -386,7 +386,7 @@
receiver->Stop();
delete receiver;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
cast_environment->Shutdown();
}
diff --git a/chrome/browser/extensions/api/commands/command_service_browsertest.cc b/chrome/browser/extensions/api/commands/command_service_browsertest.cc
index cfd932f..efdef90 100644
--- a/chrome/browser/extensions/api/commands/command_service_browsertest.cc
+++ b/chrome/browser/extensions/api/commands/command_service_browsertest.cc
@@ -46,7 +46,7 @@
typedef ExtensionApiTest CommandServiceTest;
IN_PROC_BROWSER_TEST_F(CommandServiceTest, RemoveShortcutSurvivesUpdate) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
index b4d3fb3..d133a69 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -694,7 +694,7 @@
const storage::FileSystemURL& path,
const char* data,
int length) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Create a temp file.
base::FilePath temp_file;
if (!base::CreateTemporaryFile(&temp_file) ||
@@ -1051,7 +1051,7 @@
base::FilePath fake_path = all_downloads[1]->GetTargetFilePath();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_EQ(0, base::WriteFile(real_path, "", 0));
ASSERT_TRUE(base::PathExists(real_path));
ASSERT_FALSE(base::PathExists(fake_path));
@@ -2585,7 +2585,7 @@
" \"previous\": \"in_progress\","
" \"current\": \"complete\"}}]",
result_id)));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string disk_data;
EXPECT_TRUE(base::ReadFileToString(item->GetTargetFilePath(), &disk_data));
EXPECT_STREQ(kPayloadData, disk_data.c_str());
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 30400437..9d3ecde 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -73,7 +73,7 @@
std::unique_ptr<base::ScopedTempDir> CreateAndSetDownloadsDirectory(
PrefService* pref_service) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::unique_ptr<base::ScopedTempDir> dir(new base::ScopedTempDir);
if (!dir->CreateUniqueTempDir())
@@ -999,7 +999,7 @@
// Override the default downloads directory, so that the test can cleanup
// after itself. This section is based on CreateAndSetDownloadsDirectory
// method defined in a few other source files with tests.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::unique_ptr<base::ScopedTempDir> downloads_directory =
CreateAndSetDownloadsDirectory(browser()->profile()->GetPrefs());
ASSERT_TRUE(downloads_directory);
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
index fde936c0..50a2b82 100644
--- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -89,7 +89,7 @@
protected:
base::FilePath TempFilePath(const std::string& destination_name,
bool copy_gold) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!temp_dir_.CreateUniqueTempDir()) {
ADD_FAILURE() << "CreateUniqueTempDir failed";
return base::FilePath();
@@ -109,7 +109,7 @@
std::vector<base::FilePath> TempFilePaths(
const std::vector<std::string>& destination_names,
bool copy_gold) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!temp_dir_.CreateUniqueTempDir()) {
ADD_FAILURE() << "CreateUniqueTempDir failed";
return std::vector<base::FilePath>();
@@ -132,7 +132,7 @@
}
void CheckStoredDirectoryMatches(const base::FilePath& filename) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension);
std::string extension_id = extension->id();
@@ -162,7 +162,7 @@
#if defined(OS_WIN) || defined(OS_POSIX)
IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiGetDisplayPathPrettify) {
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
base::DIR_HOME, test_root_folder_, false, false));
}
@@ -180,7 +180,7 @@
FileSystemApiGetDisplayPathPrettifyMac) {
base::FilePath test_file;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// On Mac, "test.localized" will be localized into just "test".
base::FilePath test_path = TempFilePath("test.localized", false);
ASSERT_TRUE(base::CreateDirectory(test_path));
@@ -229,7 +229,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
@@ -253,7 +253,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
@@ -268,7 +268,7 @@
base::FilePath test_file = TempFilePath("open_existing.txt", true);
ASSERT_FALSE(test_file.empty());
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
chrome::DIR_USER_DOCUMENTS, test_file.DirName(), false, false));
}
@@ -350,7 +350,7 @@
ASSERT_FALSE(test_file.empty());
base::FilePath test_directory = test_file.DirName();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
@@ -368,7 +368,7 @@
ASSERT_FALSE(test_file.empty());
base::FilePath test_directory = test_file.DirName();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
@@ -387,7 +387,7 @@
base::FilePath test_directory = test_file.DirName();
base::FilePath parent_directory = test_directory.DirName();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, test_directory, false, false));
}
@@ -409,7 +409,7 @@
base::FilePath test_directory = test_file.DirName();
base::FilePath parent_directory = test_directory.DirName();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::OverrideAndCreateIfNeeded(
kGraylistedPath, parent_directory, false, false));
}
diff --git a/chrome/browser/extensions/api/i18n/i18n_apitest.cc b/chrome/browser/extensions/api/i18n/i18n_apitest.cc
index 0a1735a..6eda361 100644
--- a/chrome/browser/extensions/api/i18n/i18n_apitest.cc
+++ b/chrome/browser/extensions/api/i18n/i18n_apitest.cc
@@ -22,7 +22,7 @@
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, I18NUpdate) {
ASSERT_TRUE(embedded_test_server()->Start());
// Create an Extension whose messages.json file will be updated.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir extension_dir;
ASSERT_TRUE(extension_dir.CreateUniqueTempDir());
base::CopyFile(
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
index dc42c2d..4df504c 100644
--- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
@@ -29,14 +29,14 @@
class ImageWriterUtilityClientTest : public InProcessBrowserTest {
public:
ImageWriterUtilityClientTest() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
test_device_ = base::FilePath().AppendASCII(
extensions::mojom::RemovableStorageWriter::kTestDevice);
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
}
void FillImageFileWithPattern(char pattern) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &image_));
base::RunLoop run_loop;
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
index a810a65..b2e8d86 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_apitest.cc
@@ -107,7 +107,7 @@
test_data_dir_.AppendASCII(kTestDir + extension_name);
from_dir = from_dir.NormalizePathSeparators();
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
if (!temp_dir.CreateUniqueTempDir())
return false;
@@ -168,7 +168,7 @@
// with no default media galleries, such as CHROMEOS. This fake gallery is
// pre-populated with a test.jpg and test.txt.
void MakeSingleFakeGallery(MediaGalleryPrefId* pref_id) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_FALSE(fake_gallery_temp_dir_.IsValid());
ASSERT_TRUE(fake_gallery_temp_dir_.CreateUniqueTempDir());
@@ -200,7 +200,7 @@
}
void AddFileToSingleFakeGallery(const base::FilePath& source_path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(fake_gallery_temp_dir_.IsValid());
ASSERT_TRUE(base::CopyFile(
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
index e8e43de0..0e662e5 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc
@@ -110,7 +110,7 @@
}
bool AddNewFileInTestGallery() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath gallery_file =
test_gallery_.GetPath().Append(FILE_PATH_LITERAL("test1.txt"));
std::string content("new content");
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
index 3c28d3e..4067196 100644
--- a/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
+++ b/chrome/browser/extensions/api/messaging/native_messaging_test_util.cc
@@ -69,7 +69,7 @@
ScopedTestNativeMessagingHost::ScopedTestNativeMessagingHost() {}
void ScopedTestNativeMessagingHost::RegisterTestHost(bool user_level) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
ScopedTestNativeMessagingHost test_host;
@@ -102,7 +102,7 @@
}
ScopedTestNativeMessagingHost::~ScopedTestNativeMessagingHost() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ignore_result(temp_dir_.Delete());
}
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
index 6bc8dc15..df5f8b07 100644
--- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
+++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
@@ -62,7 +62,7 @@
content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
// Make sure the temporary file is destroyed once the javascript side reads
// the contents.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_FALSE(base::PathExists(delegate.temp_file_));
}
@@ -78,7 +78,7 @@
ASSERT_FALSE(delegate.temp_file_.empty());
content::RunAllTasksUntilIdle();
content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_FALSE(base::PathExists(delegate.temp_file_));
}
diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
index 2238cca..23278aec 100644
--- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
+++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc
@@ -152,7 +152,7 @@
}
void InitializeDownloadSettings() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(browser());
ASSERT_TRUE(downloads_dir_.CreateUniqueTempDir());
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
index 16c58cb3..da1fc21 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -404,7 +404,7 @@
}
IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir download_directory;
ASSERT_TRUE(download_directory.CreateUniqueTempDir());
DownloadPrefs* download_prefs =
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc
index e13d805..4a8f8d6 100644
--- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc
+++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_event_log_apitest.cc
@@ -67,7 +67,7 @@
: found_(false), path_(path) {}
bool Start() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (base::PathExists(path_)) {
found_ = true;
return true;
@@ -236,7 +236,7 @@
ASSERT_TRUE(waiter->Start()) << "ERROR watching for "
<< full_file_name.value();
ASSERT_TRUE(waiter->WaitForFile());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::PathExists(full_file_name));
EXPECT_TRUE(base::GetFileSize(full_file_name, &file_size));
EXPECT_GT(file_size, 0);
@@ -247,7 +247,7 @@
IN_PROC_BROWSER_TEST_F(WebrtcEventLogApiTest,
TestStartTimedWebRtcEventLogging) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(embedded_test_server()->Start());
content::WebContents* left_tab =
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
index 6c441e1..ef75b258 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc
@@ -221,7 +221,7 @@
// Test having the default download directory missing.
IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, MissingDownloadDir) {
// Set a non-existent directory as the download path.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
EXPECT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath missing_directory = temp_dir.Take();
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index fa7e17d..5e2d85da 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -65,7 +65,7 @@
bool CreateApp(const std::string& app_manifest,
base::FilePath* app_dir) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!app_dir_.CreateUniqueTempDir()) {
LOG(ERROR) << "Unable to create a temporary directory.";
return false;
@@ -141,7 +141,7 @@
protected:
void LaunchTestingApp() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath app_dir;
PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir);
app_dir = app_dir.AppendASCII(
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index a650aec..4da3174 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -324,7 +324,7 @@
std::string error;
scoped_refptr<const Extension> extension;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
extension = extensions::file_util::LoadExtension(
test_data_dir_.AppendASCII("app_process"),
extensions::Manifest::UNPACKED, Extension::FROM_BOOKMARK, &error);
diff --git a/chrome/browser/extensions/chrome_test_extension_loader.cc b/chrome/browser/extensions/chrome_test_extension_loader.cc
index 600586a..3b113bb 100644
--- a/chrome/browser/extensions/chrome_test_extension_loader.cc
+++ b/chrome/browser/extensions/chrome_test_extension_loader.cc
@@ -38,7 +38,7 @@
ChromeTestExtensionLoader::~ChromeTestExtensionLoader() {
// If there was a temporary directory created for a CRX, we need to clean it
// up before the member is destroyed so we can explicitly allow IO.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (temp_dir_.IsValid())
EXPECT_TRUE(temp_dir_.Delete());
}
@@ -109,7 +109,7 @@
base::FilePath ChromeTestExtensionLoader::PackExtension(
const base::FilePath& unpacked_path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!base::PathExists(unpacked_path)) {
ADD_FAILURE() << "Unpacked path does not exist: " << unpacked_path.value();
return base::FilePath();
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index b4997ef..c0e76a2 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -542,7 +542,7 @@
base::FilePath scriptfile = extension->path().AppendASCII(script_relpath);
std::string extra = "some_extra_function_call();";
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::AppendToFile(scriptfile, extra.data(), extra.size()));
}
DisableExtension(id);
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 1c79dfb..009bf95 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -157,7 +157,7 @@
const Extension* ExtensionBrowserTest::GetExtensionByPath(
const extensions::ExtensionSet& extensions,
const base::FilePath& path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath extension_path = base::MakeAbsoluteFilePath(path);
EXPECT_TRUE(!extension_path.empty());
for (const scoped_refptr<const Extension>& extension : extensions) {
@@ -264,7 +264,7 @@
profile())->extension_service();
ExtensionRegistry* registry = ExtensionRegistry::Get(profile());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string manifest;
if (!base::ReadFileToString(path.Append(manifest_relative_path), &manifest)) {
return NULL;
@@ -321,7 +321,7 @@
base::FilePath ExtensionBrowserTest::PackExtension(
const base::FilePath& dir_path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath crx_path = temp_dir_.GetPath().AppendASCII("temp.crx");
if (!base::DeleteFile(crx_path, false)) {
ADD_FAILURE() << "Failed to delete crx: " << crx_path.value();
@@ -350,7 +350,7 @@
const base::FilePath& crx_path,
const base::FilePath& pem_path,
const base::FilePath& pem_out_path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!base::PathExists(dir_path)) {
ADD_FAILURE() << "Extension dir not found: " << dir_path.value();
return base::FilePath();
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc
index b477aad..4b319f81 100644
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc
@@ -559,7 +559,7 @@
}
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutAddedOnUpdate) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -605,7 +605,7 @@
}
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutChangedOnUpdate) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -654,7 +654,7 @@
}
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutRemovedOnUpdate) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -701,7 +701,7 @@
IN_PROC_BROWSER_TEST_F(CommandsApiTest,
ShortcutAddedOnUpdateAfterBeingAssignedByUser) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -752,7 +752,7 @@
IN_PROC_BROWSER_TEST_F(CommandsApiTest,
ShortcutChangedOnUpdateAfterBeingReassignedByUser) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -807,7 +807,7 @@
// Test that Media keys do not overwrite previous settings.
IN_PROC_BROWSER_TEST_F(CommandsApiTest,
MediaKeyShortcutChangedOnUpdateAfterBeingReassignedByUser) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
@@ -861,7 +861,7 @@
IN_PROC_BROWSER_TEST_F(CommandsApiTest,
ShortcutRemovedOnUpdateAfterBeingReassignedByUser) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.
diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
index 627246cb..b9f5609 100644
--- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
+++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc
@@ -83,7 +83,7 @@
// resources.
std::string file_source;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::ReadFileToString(
test_data_dir_.AppendASCII("extension_resource_request_policy")
.AppendASCII("index.html"),
diff --git a/chrome/browser/extensions/extension_webui_apitest.cc b/chrome/browser/extensions/extension_webui_apitest.cc
index 3c234a71..cf6cf5c 100644
--- a/chrome/browser/extensions/extension_webui_apitest.cc
+++ b/chrome/browser/extensions/extension_webui_apitest.cc
@@ -37,7 +37,7 @@
bool expected_result) {
std::string script;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Tests are located in chrome/test/data/extensions/webui/$(name).
base::FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index ec3a48dd..a169bdd 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -327,7 +327,7 @@
IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, NaClInBackgroundPage) {
{
base::FilePath extdir;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
extdir = extdir.AppendASCII("ppapi/tests/extensions/load_unload/newlib");
LazyBackgroundObserver page_complete;
@@ -364,7 +364,7 @@
// page, and the Lazy Background Page stays alive.
{
base::FilePath extdir;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(PathService::Get(chrome::DIR_GEN_TEST_DATA, &extdir));
extdir = extdir.AppendASCII("ppapi/tests/extensions/popup/newlib");
ResultCatcher catcher;
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index c594d7b..1b738d8 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -337,7 +337,7 @@
}
IN_PROC_BROWSER_TEST_P(ServiceWorkerTest, UpdateRefreshesServiceWorker) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.AppendASCII("service_worker")
@@ -379,7 +379,7 @@
// TODO(crbug.com/765736) Fix the test.
IN_PROC_BROWSER_TEST_P(ServiceWorkerTest, DISABLED_UpdateWithoutSkipWaiting) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir scoped_temp_dir;
ASSERT_TRUE(scoped_temp_dir.CreateUniqueTempDir());
base::FilePath pem_path = test_data_dir_.AppendASCII("service_worker")
diff --git a/chrome/browser/extensions/startup_helper_browsertest.cc b/chrome/browser/extensions/startup_helper_browsertest.cc
index 36fcc36..8f7807d4 100644
--- a/chrome/browser/extensions/startup_helper_browsertest.cc
+++ b/chrome/browser/extensions/startup_helper_browsertest.cc
@@ -50,7 +50,7 @@
std::string error;
extensions::StartupHelper helper;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
bool result = helper.ValidateCrx(command_line, &error);
if (i->second) {
EXPECT_TRUE(result) << path.LossyDisplayName()
diff --git a/chrome/browser/extensions/test_extension_dir.cc b/chrome/browser/extensions/test_extension_dir.cc
index daf2c76..18dc45a 100644
--- a/chrome/browser/extensions/test_extension_dir.cc
+++ b/chrome/browser/extensions/test_extension_dir.cc
@@ -16,13 +16,13 @@
namespace extensions {
TestExtensionDir::TestExtensionDir() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(dir_.CreateUniqueTempDir());
EXPECT_TRUE(crx_dir_.CreateUniqueTempDir());
}
TestExtensionDir::~TestExtensionDir() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ignore_result(dir_.Delete());
ignore_result(crx_dir_.Delete());
}
@@ -40,7 +40,7 @@
void TestExtensionDir::WriteFile(const base::FilePath::StringType& filename,
base::StringPiece contents) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_EQ(base::checked_cast<int>(contents.size()),
base::WriteFile(dir_.GetPath().Append(filename), contents.data(),
contents.size()));
@@ -49,7 +49,7 @@
// This function packs the extension into a .crx, and returns the path to that
// .crx. Multiple calls to Pack() will produce extensions with the same ID.
base::FilePath TestExtensionDir::Pack() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ExtensionCreator creator;
base::FilePath crx_path =
crx_dir_.GetPath().Append(FILE_PATH_LITERAL("ext.crx"));
@@ -74,7 +74,7 @@
}
base::FilePath TestExtensionDir::UnpackedPath() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// We make this absolute because it's possible that dir_ contains a symlink as
// part of it's path. When UnpackedInstaller::GetAbsolutePath() runs as part
// of loading the extension, the extension's path is converted to an absolute
diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc
index e41893f..e3d4353 100644
--- a/chrome/browser/history/redirect_browsertest.cc
+++ b/chrome/browser/history/redirect_browsertest.cc
@@ -135,7 +135,7 @@
final_url.spec().c_str());
// Write the contents to a temporary file.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_directory;
ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
base::FilePath temp_file;
diff --git a/chrome/browser/importer/edge_importer_browsertest_win.cc b/chrome/browser/importer/edge_importer_browsertest_win.cc
index 9673760..1742658b 100644
--- a/chrome/browser/importer/edge_importer_browsertest_win.cc
+++ b/chrome/browser/importer/edge_importer_browsertest_win.cc
@@ -203,7 +203,7 @@
base::FilePath temp_path = temp_dir_.GetPath();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::CopyDirectory(data_path, temp_path, true));
ASSERT_TRUE(DecompressDatabase(temp_path.AppendASCII("edge_profile")));
}
@@ -246,7 +246,7 @@
data_path = data_path.AppendASCII("edge_profile");
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::CopyDirectory(data_path, temp_dir_.GetPath(), true));
ASSERT_TRUE(importer::IsEdgeFavoritesLegacyMode());
}
@@ -262,7 +262,7 @@
source_profile.importer_type = importer::TYPE_EDGE;
base::FilePath source_path = temp_dir_.GetPath().AppendASCII("edge_profile");
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_NE(
-1, base::WriteFile(
source_path.AppendASCII("Favorites\\Google.url:favicon:$DATA"),
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
index e64c2414..da8b76d8 100644
--- a/chrome/browser/importer/ie_importer_browsertest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -436,7 +436,7 @@
};
IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest, IEImporter) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Sets up a favorites folder.
base::FilePath path = temp_dir_.GetPath().AppendASCII("Favorites");
CreateDirectory(path.value().c_str(), NULL);
@@ -650,4 +650,3 @@
observer);
base::RunLoop().Run();
}
-
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index fd3b3e8..4a03630 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -1175,7 +1175,7 @@
{
base::FilePath path =
profile_manager->user_data_dir().AppendASCII("test_profile");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!base::PathExists(path))
ASSERT_TRUE(base::CreateDirectory(path));
other_profile =
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 9b1d16d..304b9da 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -231,7 +231,7 @@
return;
license_server_.reset(new TestLicenseServer(std::move(config)));
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(license_server_->Start());
}
query_params->push_back(
diff --git a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
index 7ae0618..3e0ff063 100644
--- a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc
@@ -243,7 +243,7 @@
};
IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
DetectErrorsInJavaScript();
ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
diff --git a/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
index 01216079..e34421d 100644
--- a/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
@@ -684,13 +684,13 @@
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
MANUAL_TestCallQualityWithAudioFromFakeDevice) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
TestWithFakeDeviceGetUserMedia(kAudioOnlyCallConstraints, "_getusermedia");
}
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
MANUAL_TestCallQualityWithAudioFromWebAudio) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (OnWin8OrHigher()) {
// http://crbug.com/379798.
LOG(ERROR) << "This test is not implemented for Win8 or higher.";
@@ -806,7 +806,7 @@
// The AGC should apply non-zero gain here.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
MANUAL_TestAutoGainControlOnLowAudio) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
kReferenceFile, kAudioOnlyCallConstraints, "_with_agc"));
}
@@ -814,7 +814,7 @@
// Since the AGC is off here there should be no gain at all.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
MANUAL_TestAutoGainIsOffWithAudioProcessingOff) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
const char* kAudioCallWithoutAudioProcessing =
"{audio: { mandatory: { echoCancellation: false } } }";
ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
diff --git a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
index fcd03a3..f92760f9 100644
--- a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
@@ -228,7 +228,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioVideoCall60SecsAndLogsInternalMetrics(
"VP8", false /* prefer_hw_video_codec */);
}
@@ -236,7 +236,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioVideoCall60SecsAndLogsInternalMetrics(
"VP9", false /* prefer_hw_video_codec */);
}
@@ -246,7 +246,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Only run test if run-time feature corresponding to |rtc_use_h264| is on.
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
@@ -264,13 +264,13 @@
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsOneWayCall60SecsAndLogsInternalMetrics("", false);
}
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsOneWayCall60SecsAndLogsInternalMetrics("", true);
}
diff --git a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
index cd287217..5fbf326 100644
--- a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
@@ -249,42 +249,42 @@
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_opus) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithAudioCodec("opus");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_ISAC) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithAudioCodec("ISAC");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_G722) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithAudioCodec("G722");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_PCMU) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithAudioCodec("PCMU");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_PCMA) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithAudioCodec("PCMA");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP8) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithVideoCodec(
"VP8", false /* prefer_hw_video_codec */);
}
@@ -292,7 +292,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallCollectingMetricsWithVideoCodec(
"VP9", false /* prefer_hw_video_codec */);
}
@@ -302,7 +302,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_H264) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Only run test if run-time feature corresponding to |rtc_use_h264| is on.
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
@@ -320,7 +320,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallMeasuringGetStatsPerformance_Promise) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallMeasuringGetStatsPerformance(
GetStatsVariation::PROMISE_BASED);
}
@@ -328,7 +328,7 @@
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallMeasuringGetStatsPerformance_Callback) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
RunsAudioAndVideoCallMeasuringGetStatsPerformance(
GetStatsVariation::CALLBACK_BASED);
}
diff --git a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
index 646f65a..7cf813df 100644
--- a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc
@@ -346,13 +346,13 @@
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
MANUAL_TestVideoQualityVp8) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
TestVideoQuality("VP8", false /* prefer_hw_video_codec */);
}
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
MANUAL_TestVideoQualityVp9) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
TestVideoQuality("VP9", false /* prefer_hw_video_codec */);
}
@@ -367,7 +367,7 @@
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
MAYBE_MANUAL_TestVideoQualityH264) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Only run test if run-time feature corresponding to |rtc_use_h264| is on.
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc
index b34bfe6..68e910b 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -94,7 +94,7 @@
}
EnsureMediaDirectoriesExists::~EnsureMediaDirectoriesExists() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ignore_result(fake_dir_.Delete());
}
@@ -131,7 +131,7 @@
}
base::FilePath EnsureMediaDirectoriesExists::GetFakeAppDataPath() const {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
DCHECK(fake_dir_.IsValid());
return fake_dir_.GetPath().AppendASCII("appdata");
}
diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
index 1153f7c..80141fb 100644
--- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
+++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
@@ -57,7 +57,7 @@
return;
}
#endif
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::CreateTemporaryFile(&mock_nacl_gdb_file));
env->SetVar("MOCK_NACL_GDB", mock_nacl_gdb_file.AsUTF8Unsafe());
RunTestViaHTTP(test_name);
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc
index 89b8643d..6facf95 100644
--- a/chrome/browser/net/errorpage_browsertest.cc
+++ b/chrome/browser/net/errorpage_browsertest.cc
@@ -562,7 +562,7 @@
// button to launch a network diagnostics tool.
IN_PROC_BROWSER_TEST_F(ErrorPageTest, FileNotFound) {
// Create an empty temp directory, to be sure there's no file in it.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
GURL non_existent_file_url =
diff --git a/chrome/browser/net/network_context_configuration_browsertest.cc b/chrome/browser/net/network_context_configuration_browsertest.cc
index bbbc960..ebe0c8f 100644
--- a/chrome/browser/net/network_context_configuration_browsertest.cc
+++ b/chrome/browser/net/network_context_configuration_browsertest.cc
@@ -180,7 +180,7 @@
}
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, FileURL) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir_;
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
base::FilePath file_path;
@@ -259,7 +259,7 @@
// cache in the next test). The profile directory is preserved between the
// PRE_DiskCache and DiskCache run, so can just keep a file there.
GURL test_url = embedded_test_server()->GetURL("/echoheadercache?foo");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath save_url_file_path = browser()->profile()->GetPath().Append(
FILE_PATH_LITERAL("url_for_test.txt"));
ASSERT_EQ(static_cast<int>(test_url.spec().length()),
@@ -288,7 +288,7 @@
// browser restart.
IN_PROC_BROWSER_TEST_P(NetworkContextConfigurationBrowserTest, DiskCache) {
// Load URL from the above test body to disk.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath save_url_file_path = browser()->profile()->GetPath().Append(
FILE_PATH_LITERAL("url_for_test.txt"));
std::string test_url_string;
diff --git a/chrome/browser/net/profile_network_context_service_browsertest.cc b/chrome/browser/net/profile_network_context_service_browsertest.cc
index 5d9f51d..1bd9c417 100644
--- a/chrome/browser/net/profile_network_context_service_browsertest.cc
+++ b/chrome/browser/net/profile_network_context_service_browsertest.cc
@@ -92,7 +92,7 @@
chrome::GetUserCacheDirectory(browser()->profile()->GetPath(),
&expected_cache_path);
expected_cache_path = expected_cache_path.Append(chrome::kCacheDirname);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(expected_cache_path));
}
@@ -174,7 +174,7 @@
TempPath()
.Append(browser()->profile()->GetPath().BaseName())
.Append(chrome::kCacheDirname);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::PathExists(expected_cache_path));
}
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
index 8fbbc65c..898b5f7d 100644
--- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
+++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -679,7 +679,7 @@
IN_PROC_BROWSER_TEST_F(PageLoadMetricsBrowserTest, IgnoreDownloads) {
ASSERT_TRUE(embedded_test_server()->Start());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir downloads_directory;
ASSERT_TRUE(downloads_directory.CreateUniqueTempDir());
browser()->profile()->GetPrefs()->SetFilePath(
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
index 9fb86b8..2ccb208c 100644
--- a/chrome/browser/password_manager/password_manager_browsertest.cc
+++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -100,7 +100,7 @@
};
GURL GetFileURL(const char* filename) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("password").AppendASCII(filename);
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc
index 8a1ba11..f70c0cc 100644
--- a/chrome/browser/pdf/pdf_extension_test.cc
+++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -152,7 +152,7 @@
std::string mock_interactions_js;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
test_data_dir = test_data_dir.Append(FILE_PATH_LITERAL("pdf"));
@@ -209,7 +209,7 @@
// the test if base::Hash(filename) mod kNumberLoadTestParts == k in order
// to shard the files evenly across values of k in [0, kNumberLoadTestParts).
void LoadAllPdfsTest(const std::string& dir_name, int k) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
base::FileEnumerator file_enumerator(test_data_dir.AppendASCII(dir_name),
@@ -500,7 +500,7 @@
IN_PROC_BROWSER_TEST_F(PDFExtensionTest, EnsurePDFFromLocalFileLoads) {
GURL test_pdf_url;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
test_data_dir = test_data_dir.Append(FILE_PATH_LITERAL("pdf"));
diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
index cbc7275..b41210a 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -228,7 +228,7 @@
const base::Closure& done_cb,
const SkBitmap& bitmap,
content::ReadbackResponse response) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
DCHECK(snapshot_matches);
ASSERT_EQ(content::READBACK_SUCCESS, response);
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index 8d60c53..f1d9b7c6 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -284,7 +284,7 @@
}
void SetServerPolicy(const std::string& policy) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
int result = base::WriteFile(policy_file_path(), policy.data(),
policy.size());
ASSERT_EQ(base::checked_cast<int>(policy.size()), result);
diff --git a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
index 810a4b4..986f1ea 100644
--- a/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/component_cloud_policy_browsertest.cc
@@ -315,7 +315,7 @@
base::Base64UrlEncode(
kTestExtension, base::Base64UrlEncodePolicy::INCLUDE_PADDING,
&cache_subkey);
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath cache_path = browser()->profile()->GetPath()
.Append(FILE_PATH_LITERAL("Policy"))
.Append(FILE_PATH_LITERAL("Components"))
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 8dffc31..3440a77 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -894,7 +894,7 @@
EXPECT_EQ(french_title, title);
// Make sure this is really French and differs from the English title.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string loaded =
ui::ResourceBundle::GetSharedInstance().ReloadLocaleResources("en-US");
EXPECT_EQ("en-US", loaded);
@@ -1448,7 +1448,7 @@
// Verifies that the download directory can be forced by policy.
// Set the initial download directory.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir initial_dir;
ASSERT_TRUE(initial_dir.CreateUniqueTempDir());
browser()->profile()->GetPrefs()->SetFilePath(
@@ -1850,7 +1850,7 @@
URLRequestMockHTTPJob::GetMockUrl("extensions/*"));
const GURL referrer_url(URLRequestMockHTTPJob::GetMockUrl("policy/*"));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir download_directory;
ASSERT_TRUE(download_directory.CreateUniqueTempDir());
DownloadPrefs* download_prefs =
diff --git a/chrome/browser/policy/policy_prefs_browsertest.cc b/chrome/browser/policy/policy_prefs_browsertest.cc
index b35b5bcaa..13f89fc 100644
--- a/chrome/browser/policy/policy_prefs_browsertest.cc
+++ b/chrome/browser/policy/policy_prefs_browsertest.cc
@@ -232,7 +232,7 @@
typedef PolicyTestCaseMap::const_iterator iterator;
PolicyTestCases() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path = ui_test_utils::GetTestFilePath(
base::FilePath(FILE_PATH_LITERAL("policy")),
base::FilePath(FILE_PATH_LITERAL("policy_test_cases.json")));
diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc
index fe68104..10bb06d 100644
--- a/chrome/browser/policy/test/local_policy_test_server.cc
+++ b/chrome/browser/policy/test/local_policy_test_server.cc
@@ -62,7 +62,7 @@
LocalPolicyTestServer::LocalPolicyTestServer()
: net::LocalTestServer(net::BaseTestServer::TYPE_HTTP, base::FilePath()) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
CHECK(server_data_dir_.CreateUniqueTempDir());
config_file_ = server_data_dir_.GetPath().Append(kPolicyFileName);
}
@@ -74,7 +74,7 @@
LocalPolicyTestServer::LocalPolicyTestServer(const std::string& test_name)
: net::LocalTestServer(net::BaseTestServer::TYPE_HTTP, base::FilePath()) {
// Read configuration from a file in chrome/test/data/policy.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath source_root;
CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &source_root));
config_file_ = source_root
@@ -89,7 +89,7 @@
bool LocalPolicyTestServer::SetSigningKeyAndSignature(
const crypto::RSAPrivateKey* key, const std::string& signature) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
CHECK(server_data_dir_.IsValid());
std::vector<uint8_t> signing_key_bits;
@@ -145,7 +145,7 @@
bool LocalPolicyTestServer::UpdatePolicy(const std::string& type,
const std::string& entity_id,
const std::string& policy) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
CHECK(server_data_dir_.IsValid());
std::string selector = GetSelector(type, entity_id);
@@ -159,7 +159,7 @@
bool LocalPolicyTestServer::UpdatePolicyData(const std::string& type,
const std::string& entity_id,
const std::string& data) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
CHECK(server_data_dir_.IsValid());
std::string selector = GetSelector(type, entity_id);
@@ -175,7 +175,7 @@
}
bool LocalPolicyTestServer::SetPythonPath() const {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!net::LocalTestServer::SetPythonPath())
return false;
@@ -223,7 +223,7 @@
bool LocalPolicyTestServer::GetTestServerPath(
base::FilePath* testserver_path) const {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath source_root;
if (!PathService::Get(base::DIR_SOURCE_ROOT, &source_root)) {
LOG(ERROR) << "Failed to get DIR_SOURCE_ROOT";
@@ -240,7 +240,7 @@
bool LocalPolicyTestServer::GenerateAdditionalArguments(
base::DictionaryValue* arguments) const {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (!net::LocalTestServer::GenerateAdditionalArguments(arguments))
return false;
diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc
index 9d671e3..07fc47a 100644
--- a/chrome/browser/prefs/pref_functional_browsertest.cc
+++ b/chrome/browser/prefs/pref_functional_browsertest.cc
@@ -54,7 +54,7 @@
IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestDownloadDirPref) {
ASSERT_TRUE(embedded_test_server()->Start());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir new_download_dir;
ASSERT_TRUE(new_download_dir.CreateUniqueTempDir());
diff --git a/chrome/browser/prefs/pref_service_browsertest.cc b/chrome/browser/prefs/pref_service_browsertest.cc
index f65bbb9..ab2d5cd8 100644
--- a/chrome/browser/prefs/pref_service_browsertest.cc
+++ b/chrome/browser/prefs/pref_service_browsertest.cc
@@ -90,7 +90,7 @@
JSONFileValueDeserializer deserializer(original_pref_file_);
std::unique_ptr<base::Value> root;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
root = deserializer.Deserialize(NULL, NULL);
}
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index db6093c..d67f928e 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -3231,7 +3231,7 @@
IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, AutosigninInPrerenderer) {
// Set up a credential in the password store.
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
PasswordStoreFactory::GetInstance()->SetTestingFactory(
current_browser()->profile(),
password_manager::BuildPasswordStore<
diff --git a/chrome/browser/printing/pwg_raster_converter_browsertest.cc b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
index 46d3253..f7c3ebf 100644
--- a/chrome/browser/printing/pwg_raster_converter_browsertest.cc
+++ b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
@@ -67,7 +67,7 @@
}
IN_PROC_BROWSER_TEST_F(PDFToPWGRasterBrowserTest, TestSuccess) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath test_data_dir;
ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &test_data_dir));
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc
index a750b4d..a9afe2e2 100644
--- a/chrome/browser/profiles/profile_browsertest.cc
+++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -344,7 +344,7 @@
// Test OnProfileCreate is called with is_new_profile set to true when
// creating a new profile synchronously.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateNewProfileSynchronous) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -370,7 +370,7 @@
// Test OnProfileCreate is called with is_new_profile set to false when
// creating a profile synchronously with an existing prefs file.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, CreateOldProfileSynchronous) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CreatePrefsFileInDirectory(temp_dir.GetPath());
@@ -392,7 +392,7 @@
// creating a new profile asynchronously.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
DISABLED_CreateNewProfileAsynchronous) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -427,7 +427,7 @@
// creating a profile asynchronously with an existing prefs file.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
DISABLED_CreateOldProfileAsynchronous) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
CreatePrefsFileInDirectory(temp_dir.GetPath());
@@ -454,7 +454,7 @@
// Flaky: http://crbug.com/393177
// Test that a README file is created for profiles that didn't have it.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, DISABLED_ProfileReadmeCreated) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -482,7 +482,7 @@
// Test that repeated setting of exit type is handled correctly.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, ExitType) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -578,7 +578,7 @@
} // namespace
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, URLRequestContextIsolation) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -618,7 +618,7 @@
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
OffTheRecordURLRequestContextIsolation) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -688,7 +688,7 @@
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest,
WritesProfilesSynchronouslyOnEndSession) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -779,7 +779,7 @@
// Verifies the cache directory supports multiple profiles when it's overriden
// by group policy or command line switches.
IN_PROC_BROWSER_TEST_F(ProfileBrowserTest, DiskCacheDirOverride) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
int size;
const base::FilePath::StringPieceType profile_name =
FILE_PATH_LITERAL("Profile 1");
diff --git a/chrome/browser/profiling_host/memlog_browsertest.cc b/chrome/browser/profiling_host/memlog_browsertest.cc
index 45836860..7efbef3f 100644
--- a/chrome/browser/profiling_host/memlog_browsertest.cc
+++ b/chrome/browser/profiling_host/memlog_browsertest.cc
@@ -291,7 +291,7 @@
}
// Create directory for storing dumps.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
index b86b1f4..328c523 100644
--- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -154,7 +154,7 @@
// Does not work on ChromeOS.
Profile* CreateSecondaryProfile(int profile_num) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ProfileManager* profile_manager = g_browser_process->profile_manager();
base::FilePath profile_path = profile_manager->user_data_dir();
profile_path = profile_path.AppendASCII(
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
index 7a9f755..2274b32 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -1510,7 +1510,7 @@
EXPECT_TRUE(csd_service->enabled());
// Add a new Profile. SBS should keep running.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(temp_profile_dir_.CreateUniqueTempDir());
std::unique_ptr<Profile> profile2(Profile::CreateProfile(
temp_profile_dir_.GetPath(), nullptr, Profile::CREATE_MODE_SYNCHRONOUS));
@@ -1704,7 +1704,7 @@
// the profile will get destroyed in the normal browser shutdown process.
ProfileManager* profile_manager = g_browser_process->profile_manager();
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(temp_profile_dir_.CreateUniqueTempDir());
}
profile_manager->CreateProfileAsync(
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index 7526994..393b401f 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -103,7 +103,7 @@
}
void ProcessControlLaunched() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ProcessId service_pid;
EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
@@ -327,7 +327,7 @@
// Make sure we are connected to the service process.
ASSERT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
base::ProcessId service_pid;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
ForceServiceProcessShutdown(version_info::GetVersionNumber(), service_pid);
@@ -341,7 +341,7 @@
#endif
IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_CheckPid) {
base::ProcessId service_pid;
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid));
// Launch the service process.
LaunchServiceProcessControl(true);
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index e0ac637..d978d54 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -1448,7 +1448,7 @@
}
IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TabWithDownloadDoesNotGetRestored) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir download_directory;
ASSERT_TRUE(download_directory.CreateUniqueTempDir());
ASSERT_TRUE(embedded_test_server()->Start());
diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
index 35c1372..a00b4c6 100644
--- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
+++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
@@ -428,7 +428,7 @@
spellcheck::GetVersionedFileName("en-US", dict_dir);
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
size_t actual = base::WriteFile(
bdict_path, reinterpret_cast<const char*>(kCorruptedBDICT),
arraysize(kCorruptedBDICT));
@@ -464,7 +464,7 @@
content::RunAllTasksUntilIdle();
EXPECT_EQ(SpellcheckService::BDICT_CORRUPTED,
SpellcheckService::GetStatusEvent());
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (base::PathExists(bdict_path)) {
ADD_FAILURE();
EXPECT_TRUE(base::DeleteFile(bdict_path, true));
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 81d71298..08faffd 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -1665,7 +1665,7 @@
base::FilePath cert_path = net::GetTestCertsDirectory().Append(
FILE_PATH_LITERAL("websocket_client_cert.p12"));
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_TRUE(base::ReadFileToString(cert_path, &pkcs12_data));
}
EXPECT_EQ(net::OK,
@@ -1744,7 +1744,7 @@
GURL url_non_dangerous = embedded_test_server()->GetURL("/title1.html");
GURL url_dangerous =
https_server_expired_.GetURL("/downloads/dangerous/dangerous.exe");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir downloads_directory_;
// Need empty temp dir to avoid having Chrome ask us for a new filename
@@ -2775,7 +2775,7 @@
protected:
void WriteFile(const base::FilePath::StringType& filename,
base::StringPiece contents) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_EQ(base::checked_cast<int>(contents.size()),
base::WriteFile(tmp_dir_.GetPath().Append(filename),
contents.data(), contents.size()));
@@ -6178,7 +6178,7 @@
void SetUpCertVerifier(bool use_chrome_66_date) {
net::CertVerifyResult verify_result;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
verify_result.verified_cert = net::CreateCertificateChainFromFile(
net::GetTestCertsDirectory(),
use_chrome_66_date ? "pre_june_2016.pem" : "post_june_2016.pem",
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index b933b6ff..8f5f3731 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -855,7 +855,7 @@
}
gfx::Image Create1xFaviconFromPNGFile(const std::string& path) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
const char* kPNGExtension = ".png";
if (!base::EndsWith(path, kPNGExtension,
base::CompareCase::INSENSITIVE_ASCII))
diff --git a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
index ddf9c6f8..db35c11 100644
--- a/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_directory_sync_test.cc
@@ -34,7 +34,7 @@
// will avoid seeing any of those, and return iff Directory database files still
// exist.
bool FolderContainsFiles(const FilePath& folder) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (base::DirectoryExists(folder)) {
return !FileEnumerator(folder, false, FileEnumerator::FILES).Next().empty();
} else {
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc
index 13fa2e7..76454e3 100644
--- a/chrome/browser/sync/test/integration/sync_extension_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc
@@ -84,7 +84,7 @@
std::string SyncExtensionHelper::InstallExtension(
Profile* profile, const std::string& name, Manifest::Type type) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
scoped_refptr<Extension> extension = GetExtension(profile, name, type);
if (!extension.get()) {
NOTREACHED() << "Could not install extension " << name;
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 3ba85c2..1a5977c 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -341,7 +341,7 @@
}
bool SyncTest::CreateProfile(int index) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
tmp_profile_paths_[index] = new base::ScopedTempDir();
if (UsingExternalServers() && num_clients_ > 1) {
// For multi profile UI signin, profile paths should be outside user data
@@ -515,7 +515,7 @@
}
bool SyncTest::SetupClients() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
if (num_clients_ <= 0)
LOG(FATAL) << "num_clients_ incorrectly initialized.";
if (!profiles_.empty() || !browsers_.empty() || !clients_.empty())
@@ -657,7 +657,7 @@
}
bool SyncTest::SetupSync() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Create sync profiles and clients if they haven't already been created.
if (profiles_.empty()) {
if (!SetupClients()) {
diff --git a/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc b/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
index e717f987..0b95fd67 100644
--- a/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
+++ b/chrome/browser/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
@@ -297,7 +297,7 @@
PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
std::string favicon_string;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ReadFileToString(
test_dir.AppendASCII("favicon").AppendASCII("icon.png"),
&favicon_string);
diff --git a/chrome/browser/themes/theme_service_browsertest.cc b/chrome/browser/themes/theme_service_browsertest.cc
index b4d5222..1f80334 100644
--- a/chrome/browser/themes/theme_service_browsertest.cc
+++ b/chrome/browser/themes/theme_service_browsertest.cc
@@ -76,7 +76,7 @@
// Add a vestigial .pak file that should be removed when the new one is
// created.
// TODO(estade): remove when vestigial .pak file deletion is removed.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_EQ(
1, base::WriteFile(profile->GetPrefs()
->GetFilePath(prefs::kCurrentThemePackFilename)
@@ -108,7 +108,7 @@
->GetPrefs()
->GetFilePath(prefs::kCurrentThemePackFilename)
.AppendASCII("Cached Theme Material Design.pak");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(old_path)) << "File not deleted: "
<< old_path.value();
}
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index d7d6ec0..c25738d4 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -172,7 +172,7 @@
class TestInterstitialPage : public content::InterstitialPageDelegate {
public:
explicit TestInterstitialPage(WebContents* tab) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath file_path;
bool success = PathService::Get(chrome::DIR_TEST_DATA, &file_path);
EXPECT_TRUE(success);
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
index 62479d2..6b1d185 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.mm
@@ -19,7 +19,7 @@
scoped_refptr<extensions::Extension> LoadInstallPromptExtension(
const char* extension_dir_name,
const char* manifest_file) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
scoped_refptr<Extension> extension;
base::FilePath path;
@@ -51,7 +51,7 @@
}
gfx::Image LoadInstallPromptIcon() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
path = path.AppendASCII("extensions")
diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
index fd0de4ab..ddc9e3e 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -434,7 +434,7 @@
base::FilePath().AppendASCII("LongFind.txt"));
std::string query;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ReadFileToString(path, &query);
}
EXPECT_EQ(1, FindInPage16(web_contents, base::UTF8ToUTF16(query),
@@ -498,7 +498,7 @@
std::string query;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ReadFileToString(path, &query);
}
EXPECT_EQ(1, FindInPage16(web_contents, base::UTF8ToUTF16(query),
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc
index 980d524..66278e3 100644
--- a/chrome/browser/ui/global_error/global_error_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -148,7 +148,7 @@
// To trigger a bubble alert (rather than a menu alert), the extension must
// come from the webstore, which needs the update to come from a signed crx.
const char kExtensionWithUpdateUrl[] = "akjooamlhcgeopfifcmlggaebeocgokj";
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir;
base::FilePath crx_path = PackCRXInTempDir(
&temp_dir, "update_from_webstore", "update_from_webstore.pem");
diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
index c0b7dfe..5dc7fa8 100644
--- a/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
@@ -89,7 +89,7 @@
// Switches the browser language to French, and returns true iff successful.
bool SwitchToFrench() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
// Make sure the default language is not French.
std::string default_locale = g_browser_process->GetApplicationLocale();
EXPECT_NE("fr", default_locale);
@@ -149,7 +149,7 @@
void SetUserSelectedDefaultSearchProvider(const std::string& base_url,
const std::string& ntp_url) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
TemplateURLData data;
data.SetShortName(base::UTF8ToUTF16(base_url));
data.SetKeyword(base::UTF8ToUTF16(base_url));
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index 5df7fca..8b06e99 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -494,7 +494,7 @@
Profile* other_profile = nullptr;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
other_profile = profile_manager->GetProfile(dest_path);
}
ASSERT_TRUE(other_profile);
@@ -682,7 +682,7 @@
base::FilePath dest_path4 = profile_manager->user_data_dir().Append(
FILE_PATH_LITERAL("New Profile 4"));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
Profile* profile_home1 = profile_manager->GetProfile(dest_path1);
ASSERT_TRUE(profile_home1);
Profile* profile_home2 = profile_manager->GetProfile(dest_path2);
@@ -795,7 +795,7 @@
Profile* profile_last = nullptr;
Profile* profile_urls = nullptr;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
profile_home = profile_manager->GetProfile(dest_path1);
ASSERT_TRUE(profile_home);
profile_last = profile_manager->GetProfile(dest_path2);
@@ -1162,7 +1162,7 @@
Profile* profile1 = nullptr;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
profile1 = Profile::CreateProfile(
dest_path.Append(FILE_PATH_LITERAL("New Profile 1")), nullptr,
Profile::CreateMode::CREATE_MODE_SYNCHRONOUS);
diff --git a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
index a7af7ad..171bc72e 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
@@ -273,7 +273,7 @@
CloseBrowsersSynchronouslyForProfileBasePath("Profile 1");
CreateAndSwitchToProfile("Profile 2");
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::CreateDirectory(ProfileManager::GetGuestProfilePath()));
ASSERT_TRUE(base::CreateDirectory(ProfileManager::GetSystemProfilePath()));
}
@@ -303,7 +303,7 @@
// Create the guest profile path, but not the system profile one. This will
// make it impossible to create the system profile once the permissions are
// locked down during setup.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::CreateDirectory(ProfileManager::GetGuestProfilePath()));
}
@@ -404,7 +404,7 @@
// manager instead.
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorCorruptProfileTest,
PRE_DeletedProfileFallbackToUserManager) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ASSERT_TRUE(base::CreateDirectory(ProfileManager::GetGuestProfilePath()));
ASSERT_TRUE(base::CreateDirectory(ProfileManager::GetSystemProfilePath()));
}
diff --git a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
index d664dc82..ee39eeb8 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_interactive_uitest.cc
@@ -29,7 +29,7 @@
// And this test is useless without that functionality.
#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX)
IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, LastUsedProfileActivated) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ProfileManager* profile_manager = g_browser_process->profile_manager();
// Create 4 profiles, they will be scheduled for destruction when the last
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
index 2da167c..09ac1dd 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -244,7 +244,7 @@
profile_manager->user_data_dir().AppendASCII("test_profile");
Profile* other_profile = nullptr;
{
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
other_profile =
Profile::CreateProfile(path, nullptr, Profile::CREATE_MODE_SYNCHRONOUS);
}
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
index b3e6c3a2..d3cb25d 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc
@@ -43,7 +43,7 @@
namespace {
Profile* CreateTestingProfile(const std::string& profile_name) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
ProfileManager* profile_manager = g_browser_process->profile_manager();
size_t starting_number_of_profiles = profile_manager->GetNumberOfProfiles();
@@ -62,7 +62,7 @@
}
Profile* CreateProfileOutsideUserDataDir() {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::FilePath path;
if (!base::CreateNewTempDirectory(base::FilePath::StringType(), &path))
NOTREACHED() << "Could not create directory at " << path.MaybeAsASCII();
@@ -77,7 +77,7 @@
// Set up the profiles to enable Lock. Takes as parameter a profile that will be
// signed in, and also creates a supervised user (necessary for lock).
void SetupProfilesForLock(Profile* signed_in) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
const char signed_in_email[] = "[email protected]";
// Set up the |signed_in| profile.
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index 6114dede..56ce9b2 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
@@ -299,7 +299,7 @@
void NetInternalsTest::MessageHandler::GetNetLogFileContents(
const base::ListValue* list_value) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::unique_ptr<WriteNetLogState> state =
base::MakeUnique<WriteNetLogState>();
@@ -343,7 +343,7 @@
void NetInternalsTest::MessageHandler::OnFinishedWritingNetLog(
std::unique_ptr<WriteNetLogState> state) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string log_contents;
ASSERT_TRUE(base::ReadFileToString(state->log_path, &log_contents));
diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc
index 48a7664a..9fff3ea6 100644
--- a/chrome/browser/ui/webui/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc
@@ -274,7 +274,7 @@
base::TaskScheduler::GetInstance()->FlushForTesting();
// Open the created file.
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::string file_contents;
EXPECT_TRUE(
base::ReadFileToString(export_policies_test_file_path, &file_contents));
@@ -478,7 +478,7 @@
IN_PROC_BROWSER_TEST_F(PolicyUITest, ExtensionLoadAndSendPolicy) {
ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIPolicyURL));
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
base::ScopedTempDir temp_dir_;
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
diff --git a/chrome/browser/ui/webui/test_files_request_filter.cc b/chrome/browser/ui/webui/test_files_request_filter.cc
index 2d52912..b9604f3 100644
--- a/chrome/browser/ui/webui/test_files_request_filter.cc
+++ b/chrome/browser/ui/webui/test_files_request_filter.cc
@@ -17,7 +17,7 @@
bool HandleTestFileRequestCallback(
const std::string& path,
const content::WebUIDataSource::GotDataCallback& callback) {
- base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ScopedAllowBlockingForTesting allow_blocking;
std::vector<std::string> url_substr =
base::SplitString(path, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
if (url_substr.size() != 2 || url_substr[0] != "test")
