Remove the creation of the PromoResourceService on all platforms except iOS.

On iOS, it is created in the ApplicationContextImpl.

BUG=576772
R=rohitrao@chromium.org,sdefresne@chromium.org

Review URL: https://codereview.chromium.org/1578283002

Cr-Commit-Position: refs/heads/master@{#369750}

4 files changed, 0 insertions, 18 deletions

diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 0acb6d5..4dff7d2 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -1085,17 +1085,6 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
 #endif
 #endif  // defined(ENABLE_PLUGINS)
 
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kDisableWebResources)) {
-    DCHECK(!promo_resource_service_.get());
-    promo_resource_service_.reset(new web_resource::PromoResourceService(
-        local_state(), chrome::GetChannel(), GetApplicationLocale(),
-        system_request_context(), switches::kDisableBackgroundNetworking,
-        base::Bind(safe_json::SafeJsonParser::Parse)));
-    promo_resource_service_->StartAfterDelay();
-  }
-
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   storage_monitor::StorageMonitor::Create();
 #endif
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 3ee9af6..1b9d664 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -336,9 +336,6 @@ const char kDisableSiteEngagementService[] = "disable-site-engagement-service";
 const char kDisableWebNotificationCustomLayouts[] =
     "disable-web-notification-custom-layouts";
 
-// Disables the backend service for web resources.
-const char kDisableWebResources[]           = "disable-web-resources";
-
 // Some tests seem to require the application to close when the last
 // browser window is closed. Thus, we need a switch to force this behavior
 // for ChromeOS Aura, disable "zero window mode".
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index af6ab32..71aac50 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -98,7 +98,6 @@ extern const char kDisableQuicPortSelection[];
 extern const char kDisableSessionCrashedBubble[];
 extern const char kDisableSiteEngagementService[];
 extern const char kDisableWebNotificationCustomLayouts[];
-extern const char kDisableWebResources[];
 extern const char kDisableZeroBrowsersOpenForTests[];
 extern const char kDiskCacheDir[];
 extern const char kDiskCacheSize[];
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index fe402d3..fdd84db 100644
--- a/chrome/test/base/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -23,9 +23,6 @@
 namespace test_launcher_utils {
 
 void PrepareBrowserCommandLineForTests(base::CommandLine* command_line) {
-  // Turn off tip loading for tests; see http://crbug.com/17725.
-  command_line->AppendSwitch(switches::kDisableWebResources);
-
   // Turn off preconnects because they break the brittle python webserver;
   // see http://crbug.com/60035.
   command_line->AppendSwitch(switches::kDisablePreconnect);