Remove unused includes of plugin_list.h. Also remove unused ContentClient and webkit_support method…

content/browser/plugin_service_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 "content/browser/plugin_service_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
@@ skipping 50 matching lines @@
 };
 
 bool LoadPluginListInProcess() {
 #if defined(OS_WIN)
   return true;
 #else
   // If on POSIX, we don't want to load the list of NPAPI plugins in-process as
   // that causes instability.
 
   // Can't load the plugins on the utility thread when in single process mode
-  // since that requires using WebKit and GTK and they can only be used on the
-  // main thread.
+  // since that requires GTK which can only be used on the main thread.
   if (RenderProcessHost::run_renderer_in_process())
     return true;
 
   return !webkit::npapi::NPAPIPluginsSupported();
 #endif
 }
 
 // Callback set on the PluginList to assert that plugin loading happens on the
 // correct thread.
 void WillLoadPluginsCallback(
@@ skipping 103 matching lines @@
         ASCIIToUTF16("1.2.3.4"),
         ASCIIToUTF16("Browser Plugin."));
     webview_plugin.type = webkit::WebPluginInfo::PLUGIN_TYPE_NPAPI;
     webkit::WebPluginMimeType webview_plugin_mime_type;
     webview_plugin_mime_type.mime_type = "application/browser-plugin";
     webview_plugin_mime_type.file_extensions.push_back("*");
     webview_plugin.mime_types.push_back(webview_plugin_mime_type);
     RegisterInternalPlugin(webview_plugin, true);
   }
 
-  GetContentClient()->AddNPAPIPlugins(plugin_list_);
-
   // Load any specified on the command line as well.
   base::FilePath path =
       command_line->GetSwitchValuePath(switches::kLoadPlugin);
   if (!path.empty())
     AddExtraPluginPath(path);
   path = command_line->GetSwitchValuePath(switches::kExtraPluginDir);
   if (!path.empty())
     plugin_list_->AddExtraPluginDir(path);
 
   if (command_line->HasSwitch(switches::kDisablePluginsDiscovery))
@@ skipping 586 matching lines @@
 void PluginServiceImpl::GetInternalPlugins(
     std::vector<webkit::WebPluginInfo>* plugins) {
   plugin_list_->GetInternalPlugins(plugins);
 }
 
 webkit::npapi::PluginList* PluginServiceImpl::GetPluginList() {
   return plugin_list_;
 }
 
 }  // namespace content