Adding --disable-plugins-discovery command line switch to not load third-party plugins from common …

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 149 matching lines @@
       created_local_state_(false),
       created_icon_manager_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false),
       render_widget_snapshot_taker_(new RenderWidgetSnapshotTaker),
       download_status_updater_(new DownloadStatusUpdater),
-      local_state_task_runner_(local_state_task_runner) {
+      local_state_task_runner_(local_state_task_runner),
+      command_line_(command_line) {
   g_browser_process = this;
   platform_part_.reset(new BrowserProcessPlatformPart());
 
 #if defined(ENABLE_PRINTING)
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager);
 #endif
 
   net_log_.reset(new ChromeNetLog);
 
@@ skipping 696 matching lines @@
     ApplyDefaultBrowserPolicy();
 
 #if defined(ENABLE_PLUGINS)
   PluginService* plugin_service = PluginService::GetInstance();
   plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance());
   plugin_service->StartWatchingPlugins();
 
 #if defined(OS_POSIX)
   // Also find plugins in a user-specific plugins dir,
   // e.g. ~/.config/chromium/Plugins.
-  base::FilePath user_data_dir;
-  if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
-    plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
+  if (!command_line_.HasSwitch(switches::kDisablePluginsDiscovery)) {

[seva, 2013/06/06 22:11:25]

On this note, it feels that this "Plugins" directory should be a part of what
PluginList::GetPluginDirectories() returns.

That way these "if
(!command_line_.HasSwitch(switches::kDisablePluginsDiscovery))" checks are
better localized.

Also, functionally, this directory is being "watched" for file changes and
related functionality works too (See PluginServiceImpl::StartWatchingPlugins(),
https://code.google.com/p/chromium/codesearch#chromium/src/content/browser/pl...
).

If what I'm saying makes sense and fixing this isn't too involved I'm happy to
work on addressing; separately from BUG=239325

[Bernhard Bauer, 2013/06/07 10:33:43]

Well, this directory is not being returned by default by PluginList because it's
meant to contain plug-ins that are specific to Chrome. 

PluginList is part of the general framework for a multi-process browser
("content"), which shouldn't contain Chrome-specific code. The other plug-in
locations are used by other browsers (Firefox and Safari on Mac, specifically).

That being said, ...
...hmm, it would indeed make sense for PluginList::GetPluginDirectories() to
return extra plug-in directories as well. That would make watching for changes
work automatically, and we'd need to check the switch only once.

+    base::FilePath user_data_dir;
+    if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
+      plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
+  }
 #endif
 
   // Triggers initialization of the singleton instance on UI thread.
   PluginFinder::GetInstance()->Init();
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   DCHECK(!plugins_resource_service_.get());
   plugins_resource_service_ = new PluginsResourceService(local_state());
   plugins_resource_service_->Init();
 #endif
 #endif  // defined(ENABLE_PLUGINS)
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kDisableWebResources)) {
+  if (!command_line_.HasSwitch(switches::kDisableWebResources)) {
     DCHECK(!promo_resource_service_.get());
     promo_resource_service_ = new PromoResourceService;
     promo_resource_service_->StartAfterDelay();
   }
 
 #if !defined(OS_ANDROID)
   if (browser_defaults::bookmarks_enabled &&
       BookmarkPromptController::IsEnabled()) {
     bookmark_prompt_controller_.reset(new BookmarkPromptController());
   }
@@ skipping 144 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)