Revert r108760 / reland r108744, r108753 w/ fix

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index d1ef581b8e9315ed7d3cf949df3fa77036b19d66..984e89fce9b15beb5649863101ba4502e7d2c595 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -61,7 +61,6 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/default_plugin.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/json_pref_store.h"
@@ -90,7 +89,6 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(OS_WIN)
 #include "views/focus/view_storage.h"
@@ -792,15 +790,12 @@ void BrowserProcessImpl::CreateIOThread() {
   plugin_service->set_filter(ChromePluginServiceFilter::GetInstance());
   plugin_service->StartWatchingPlugins();
 
-  // Add the Chrome specific plugins.
-  chrome::RegisterInternalDefaultPlugin();
-
   // Register the internal Flash if available.
   FilePath path;
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableInternalFlash) &&
       PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) {
-    webkit::npapi::PluginList::Singleton()->AddExtraPluginPath(path);
+    plugin_service->AddExtraPluginPath(path);
   }
 
 #if defined(OS_POSIX)
@@ -808,8 +803,7 @@ void BrowserProcessImpl::CreateIOThread() {
   // e.g. ~/.config/chromium/Plugins.
   FilePath user_data_dir;
   if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
-    webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(
-        user_data_dir.Append("Plugins"));
+    plugin_service->AddExtraPluginPath(user_data_dir.Append("Plugins"));
   }
 #endif