diff options
| -rw-r--r-- | chrome/browser/browser_main.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/new_tab_ui.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 6 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 3 |
6 files changed, 7 insertions, 10 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 9b71bde..6e49ab4 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -794,7 +794,7 @@ int BrowserMain(const MainFunctionParams& parameters) { profile->InitExtensions(); // Start up the web resource service. This starts loading data after a // short delay so as not to interfere with startup time. - if (parsed_command_line.HasSwitch(switches::kEnableWebResources)) + if (!parsed_command_line.HasSwitch(switches::kDisableWebResources)) profile->InitWebResources(); #if defined(OS_CHROMEOS) diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 6e90533..ab9440b 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -1600,7 +1600,7 @@ bool NewTabUI::UseOldNewTabPage() { // static bool NewTabUI::WebResourcesEnabled() { const CommandLine* command_line = CommandLine::ForCurrentProcess(); - return command_line->HasSwitch(switches::kEnableWebResources); + return !command_line->HasSwitch(switches::kDisableWebResources); } // static diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 8fc249e..27d563d 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -497,7 +497,7 @@ const wchar_t kOldNewTabPage[] = L"old-new-tab-page"; // Enables the backend service for web resources, used in the new tab page for // loading tips and recommendations from a JSON feed. -const wchar_t kEnableWebResources[] = L"enable-web-resources"; +const wchar_t kDisableWebResources[] = L"disable-web-resources"; // Whether we should prevent the new tab page from showing the first run // notification. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index ef9a465..c91c558 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -186,7 +186,7 @@ extern const wchar_t kNewTabPage[]; extern const wchar_t kOldNewTabPage[]; extern const wchar_t kDisableNewTabFirstRun[]; -extern const wchar_t kEnableWebResources[]; +extern const wchar_t kDisableWebResources[]; extern const wchar_t kEnableBenchmarking[]; diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 50d66ed..c217632 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -90,10 +90,8 @@ void InProcessBrowserTest::SetUp() { if (single_process_) command_line->AppendSwitch(switches::kSingleProcess); - // TODO(arv): Reenable once kEnableWebResources is changed back to - // kDisableWebResources - // http://crbug.com/17725 - // command_line->AppendSwitch(switches::kEnableWebResources); + // Turn off tip loading for tests; see http://crbug.com/17725 + command_line->AppendSwitch(switches::kDisableWebResources); command_line->AppendSwitchWithValue(switches::kUserDataDir, user_data_dir.ToWStringHack()); diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 4be37c3c..51eb703 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -367,8 +367,7 @@ 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. - // Reenable once kEnableWebResources is changed back to kDisableWebResources - // command_line.AppendSwitch(switches::kEnableWebResources); + command_line.AppendSwitch(switches::kDisableWebResources); #if defined(OS_POSIX) const char* alternative_userdir = getenv("CHROME_UI_TESTS_USER_DATA_DIR"); #else |