Exclude PluginService for builds with enable_plugins==0

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 766 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() {
+#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) &&
       PathService::Get(chrome::FILE_FLASH_PLUGIN_EXISTING, &path)) {
     plugin_service->AddExtraPluginPath(path);
@@ skipping 12 matching lines @@
 
 #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
 
+#if defined(ENABLE_PLUGIN_INSTALLATION)
+  if (!plugins_resource_service_) {
+    plugins_resource_service_ = new PluginsResourceService(local_state());
+    plugins_resource_service_->StartAfterDelay();
+  }
+#endif
+#endif  // defined(ENABLE_PLUGINS)
+
   if (local_state_->IsManagedPreference(prefs::kDefaultBrowserSettingEnabled))
     ApplyDefaultBrowserPolicy();
 
   // Triggers initialization of the singleton instance on UI thread.
   PluginFinder::GetInstance()->Init();

[stuartmorgan, 2012/12/19 12:53:58]

Are you sure the ordering here wasn't important?

[nilesh, 2012/12/19 21:07:44]

Actually I am not sure. I am moving it back as it was just a cosmetic change.

 
-#if defined(ENABLE_PLUGIN_INSTALLATION)
-  if (!plugins_resource_service_) {
-    plugins_resource_service_ = new PluginsResourceService(local_state());
-    plugins_resource_service_->StartAfterDelay();
-  }
-#endif
-
 #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 131 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)