summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/in_process_browser_test.cc5
-rw-r--r--chrome/test/ui/ui_test.cc3
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 7544b49..36deb0b 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -102,7 +102,10 @@ void InProcessBrowserTest::SetUp() {
if (single_process_)
command_line->AppendSwitch(switches::kSingleProcess);
- command_line->AppendSwitch(switches::kDisableWebResources);
+ // TODO(arv): Reenable once kEnableWebResources is changed back to
+ // kDisableWebResources
+ // http://crbug.com/17725
+ // command_line->AppendSwitch(switches::kEnableWebResources);
command_line->AppendSwitchWithValue(switches::kUserDataDir, user_data_dir);
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 447464f..fd5915b 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -378,7 +378,8 @@ void UITest::LaunchBrowser(const CommandLine& arguments, bool clear_profile) {
command_line.AppendSwitchWithValue(switches::kHomePage,
homepage_);
// Don't try to fetch web resources during UI testing.
- command_line.AppendSwitch(switches::kDisableWebResources);
+ // Reenable once kEnableWebResources is changed back to kDisableWebResources
+ // command_line.AppendSwitch(switches::kEnableWebResources);
#if defined(OS_POSIX)
const char* alternative_userdir = getenv("CHROME_UI_TESTS_USER_DATA_DIR");
#else