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

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)
Patch Set: ready for review Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
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 d5d975c2eefd5d8997dcc71b5e278dde86f0518a..26c0c7c7f71e05dac3443209e36f68f61b9888b1 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc
@@ -16,6 +16,7 @@
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
+#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h"
@@ -102,6 +103,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {
const char* sub_dir,
const wallpaper::WallpaperFilesId& wallpaper_files_id,
const std::string& id) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
base::FilePath wallpaper_path =
WallpaperManager::Get()->GetCustomWallpaperPath(sub_dir,
wallpaper_files_id, id);
@@ -113,6 +115,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {
// Logs in |account_id|.
void LogIn(const AccountId& account_id, const std::string& user_id_hash) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
SessionManager::Get()->CreateSession(account_id, user_id_hash);
SessionManager::Get()->SessionStarted();
// Flush to ensure the created session and ACTIVE state reaches ash.
@@ -152,6 +155,7 @@ class WallpaperManagerBrowserTest : public InProcessBrowserTest {
// Only needs to be called (once) by tests that want to test loading of
// default wallpapers.
void CreateCmdlineWallpapers() {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
wallpaper_dir_.reset(new base::ScopedTempDir);
ASSERT_TRUE(wallpaper_dir_->CreateUniqueTempDir());
wallpaper_manager_test_utils::CreateCmdlineWallpapers(

Powered by Google App Engine
This is Rietveld 408576698