Move PromoResourceService from Profile to BrowserProcessImpl/local_state().

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 45 matching lines @@
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"
 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/common/url_constants.h"
@@ skipping 707 matching lines @@
     local_state_->RegisterBooleanPref(prefs::kRestartSwitchMode, false);
 #endif
 }
 
 void BrowserProcessImpl::PreCreateThreads() {
   io_thread_.reset(new IOThread(local_state(), policy_service(), net_log_.get(),
                                 extension_event_router_forwarder_.get()));
 }
 
 void BrowserProcessImpl::PreMainMessageLoopRun() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+
 #if defined(ENABLE_PLUGINS)
   PluginService* plugin_service = PluginService::GetInstance();
   plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance());
   plugin_service->StartWatchingPlugins();
 
   // Register the internal Flash if available.
   FilePath path;
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableInternalFlash) &&
+  if (!command_line.HasSwitch(switches::kDisableInternalFlash) &&
       PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &path)) {
     plugin_service->AddExtraPluginPath(path);
   }
 
   // Register bundled Pepper Flash if available.
   content::PepperPluginInfo plugin;
   bool add_at_beginning = false;
   chrome::ChromeContentClient* content_client =
       static_cast<chrome::ChromeContentClient*>(content::GetContentClient());
   if (content_client->GetBundledFieldTrialPepperFlash(&plugin,
                                                       &add_at_beginning)) {
     plugin_service->RegisterInternalPlugin(plugin.ToWebPluginInfo(),
                                            add_at_beginning);
   }
 
 #if defined(OS_POSIX)
   // Also find plugins in a user-specific plugins dir,
   // e.g. ~/.config/chromium/Plugins.
   FilePath user_data_dir;
   if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
     plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
   }
 #endif
 
 #endif  // defined(ENABLE_PLUGINS)
 
-  if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
+  if (local_state()->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
     ApplyDefaultBrowserPolicy();
 
   // Triggers initialization of the singleton instance on UI thread.
   PluginFinder::GetInstance()->Init();
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   if (!plugins_resource_service_) {
     plugins_resource_service_ = new PluginsResourceService(local_state());
     plugins_resource_service_->StartAfterDelay();
   }
 #endif
 
+  if (!command_line.HasSwitch(switches::kDisableWebResources) &&
+      !promo_resource_service_) {

[Bernhard Bauer, 2012/12/31 11:51:52]

When can it happen that |promo_resource_service_| is not NULL here? 

[Dan Beam, 2013/01/02 04:36:35]

I am not sure, I was just following the plugins service example above. Perhaps
jam@ will know.

[Bernhard Bauer, 2013/01/02 10:57:44]

It's probably unnecessary there as well. Feel free to remove it.

[jam, 2013/01/02 15:59:00]

I don't see where pluginservice is null checked? it looks like it's used
directly at line 798. i agree take the null check for promo_resource_service_
out.

[Dan Beam, 2013/01/02 18:10:32]

sorry, I meant L837:

  if (!plugins_resource_service_) {
    plugins_resource_service_ = new PluginsResourceService(local_state());
    plugins_resource_service_->StartAfterDelay();
  }

[jam, 2013/01/02 18:14:55]

that seems to be the only place that creates PluginResourceService, so that's
legitimate code. the null check there seems even unnecessary since it should
always be null when it gets here...

+    promo_resource_service_ = new PromoResourceService(local_state());
+    promo_resource_service_->StartAfterDelay();
+  }
+
 #if !defined(OS_ANDROID)
   if (browser_defaults::bookmarks_enabled &&
       BookmarkPromptController::IsEnabled())
     bookmark_prompt_controller_.reset(new BookmarkPromptController());
 #endif
 }
 
 void BrowserProcessImpl::CreateIconManager() {
   DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL);
   created_icon_manager_ = true;
@@ skipping 52 matching lines @@
   // create the service class if there was an error.
   created_safe_browsing_service_ = true;
 #if defined(FULL_SAFE_BROWSING) || defined(MOBILE_SAFE_BROWSING)
   safe_browsing_service_ = SafeBrowsingService::CreateSafeBrowsingService();
   safe_browsing_service_->Initialize();
 #endif
 }
 
 void BrowserProcessImpl::ApplyDisabledSchemesPolicy() {
   std::set<std::string> schemes;
-  const ListValue* scheme_list = local_state_->GetList(prefs::kDisabledSchemes);
+  const ListValue* scheme_list =
+      local_state()->GetList(prefs::kDisabledSchemes);
   for (ListValue::const_iterator iter = scheme_list->begin();
        iter != scheme_list->end(); ++iter) {
     std::string scheme;
     if ((*iter)->GetAsString(&scheme))
       schemes.insert(scheme);
   }
   ChildProcessSecurityPolicy::GetInstance()->RegisterDisabledSchemes(schemes);
 }
 
 void BrowserProcessImpl::ApplyDefaultBrowserPolicy() {
-  if (local_state_->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) {
+  if (local_state()->GetBoolean(prefs::kDefaultBrowserSettingEnabled)) {
     scoped_refptr<ShellIntegration::DefaultWebClientWorker>
         set_browser_worker = new ShellIntegration::DefaultBrowserWorker(NULL);
     set_browser_worker->StartSetAsDefault();
   }
 }
 
 void BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy() {
   bool value = local_state()->GetBoolean(prefs::kAllowCrossOriginAuthPrompt);
   ResourceDispatcherHost::Get()->SetAllowCrossOriginAuthPrompt(value);
 }
@@ skipping 48 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)