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

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 37 matching lines @@
 #include "ui/gl/gl_surface.h"
 #include "webkit/browser/fileapi/isolated_context.h"
 #include "webkit/child/webthread_impl.h"
 #include "webkit/common/gpu/test_context_provider_factory.h"
 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h"
 #include "webkit/common/user_agent/user_agent.h"
 #include "webkit/common/user_agent/user_agent_util.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webkitplatformsupport_impl.h"
 #include "webkit/glue/weburlrequest_extradata_impl.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/plugins/npapi/webplugin_page_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/test_webkit_platform_support.h"
-#include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/web_layer_tree_view_impl_for_testing.h"
 
 #if defined(OS_ANDROID)
 #include "base/test/test_support_android.h"
 #endif
 
 using WebKit::WebCString;
 using WebKit::WebDevToolsAgentClient;
 using WebKit::WebFileSystem;
 using WebKit::WebFileSystemCallbacks;
@@ skipping 99 matching lines @@
 
  private:
   scoped_ptr<MessageLoopType> main_message_loop_;
   scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
 
 #if defined(OS_ANDROID)
   base::FilePath mock_current_directory_;
 #endif
 };
 
-class WebPluginImplWithPageDelegate
-    : public webkit_support::TestWebPluginPageDelegate,
-      public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>,
-      public webkit::npapi::WebPluginImpl {
- public:
-  WebPluginImplWithPageDelegate(WebFrame* frame,
-                                const WebPluginParams& params,
-                                const base::FilePath& path)
-      : webkit_support::TestWebPluginPageDelegate(),
-        webkit::npapi::WebPluginImpl(frame, params, path, AsWeakPtr()) {}
-  virtual ~WebPluginImplWithPageDelegate() {}
- private:
-  DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate);
-};
-
 base::FilePath GetWebKitRootDirFilePath() {
   base::FilePath basePath;
   PathService::Get(base::DIR_SOURCE_ROOT, &basePath);
   if (base::PathExists(
           basePath.Append(FILE_PATH_LITERAL("third_party/WebKit")))) {
     // We're in a WebKit-in-chrome checkout.
     basePath = basePath.Append(FILE_PATH_LITERAL("third_party/WebKit"));
   } else if (base::PathExists(
           basePath.Append(FILE_PATH_LITERAL("chromium")))) {
     // We're in a WebKit-only checkout on Windows.
@@ skipping 86 matching lines @@
   test_environment = NULL;
   AfterShutdown();
   logging::CloseLogFile();
 }
 
 WebKit::Platform* GetWebKitPlatformSupport() {
   DCHECK(test_environment);
   return test_environment->webkit_platform_support();
 }
 
-WebPlugin* CreateWebPlugin(WebFrame* frame,
-                           const WebPluginParams& params) {
-  const bool kAllowWildcard = true;
-  std::vector<webkit::WebPluginInfo> plugins;
-  std::vector<std::string> mime_types;
-  webkit::npapi::PluginList::Singleton()->GetPluginInfoArray(
-      params.url, params.mimeType.utf8(), kAllowWildcard,
-      NULL, &plugins, &mime_types);
-  if (plugins.empty())
-    return NULL;
-
-  WebPluginParams new_params = params;
-  new_params.mimeType = WebString::fromUTF8(mime_types.front());
-  return new WebPluginImplWithPageDelegate(
-      frame, new_params, plugins.front().path);
-}
-
 WebKit::WebString GetWebKitRootDir() {
   base::FilePath path = GetWebKitRootDirFilePath();
   std::string path_ascii = path.MaybeAsASCII();
   CHECK(!path_ascii.empty());
   return WebKit::WebString::fromUTF8(path_ascii.c_str());
 }
 
 void SetUpGLBindings(GLBindingPreferences bindingPref) {
   switch (bindingPref) {
     case GL_BINDING_DEFAULT:
@@ skipping 355 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support