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

Unified Diff: chrome/browser/task_manager/providers/web_contents/tab_contents_tag_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/task_manager/providers/web_contents/tab_contents_tag_browsertest.cc
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 08e35d449bf7b5d51a43d392cb0033a805b061dd..060453c67944168a8cf69a2077be78ecbc1d4e2f 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
@@ -7,6 +7,7 @@
#include "base/macros.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_restrictions.h"
#include "chrome/browser/task_manager/mock_web_contents_task_manager.h"
#include "chrome/browser/task_manager/providers/web_contents/web_contents_tags_manager.h"
#include "chrome/browser/ui/browser.h"
@@ -294,8 +295,12 @@ IN_PROC_BROWSER_TEST_F(TabContentsTagTest, NavigateToPageNoFavicon) {
base::FilePath test_dir;
PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
std::string favicon_string;
- base::ReadFileToString(
- test_dir.AppendASCII("favicon").AppendASCII("icon.png"), &favicon_string);
+ {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+ base::ReadFileToString(
+ test_dir.AppendASCII("favicon").AppendASCII("icon.png"),
+ &favicon_string);
+ }
SkBitmap favicon_bitmap;
gfx::PNGCodec::Decode(
reinterpret_cast<const unsigned char*>(favicon_string.data()),
« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.cc ('k') | chrome/browser/themes/theme_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698