Move npapi_layout_test_plugin target to webkit_support to use it from...

webkit/support/webkit_support.cc

 // Copyright (c) 2010 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/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/weak_ptr.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/media/buffered_data_source.h"
 #include "webkit/glue/media/media_resource_loader_bridge_factory.h"
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
+#include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_impl.h"
 #include "webkit/glue/plugins/webplugin_page_delegate.h"
+#include "webkit/glue/plugins/webplugininfo.h"
 #include "webkit/glue/webkitclient_impl.h"
 #include "webkit/glue/webmediaplayer_impl.h"
 #include "webkit/support/platform_support.h"
 #include "webkit/support/test_webplugin_page_delegate.h"
 #include "webkit/support/test_webkit_client.h"
 #include "webkit/tools/test_shell/simple_database_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 
 using WebKit::WebFrame;
 using WebKit::WebMediaPlayerClient;
@@ skipping 36 matching lines @@
   scoped_ptr<MessageLoopForUI> main_message_loop_;
   scoped_ptr<TestWebKitClient> webkit_client_;
 };
 
 class WebPluginImplWithPageDelegate
     : public webkit_support::TestWebPluginPageDelegate,
       public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>,
       public webkit_glue::WebPluginImpl {
  public:
   WebPluginImplWithPageDelegate(WebFrame* frame,
-                                const WebPluginParams& params)
+                                const WebPluginParams& params,
+                                const FilePath& path,
+                                const std::string& mime_type)
       : webkit_support::TestWebPluginPageDelegate(),
         webkit_glue::WebPluginImpl(
-            frame, params, FilePath(), params.mimeType.utf8(), AsWeakPtr()) {}
+            frame, params, path, mime_type, AsWeakPtr()) {}
   virtual ~WebPluginImplWithPageDelegate() {}
  private:
   DISALLOW_COPY_AND_ASSIGN(WebPluginImplWithPageDelegate);
 };
 
 }  // namespace
 
 namespace webkit_support {
 
 static TestEnvironment* test_environment;
@@ skipping 38 matching lines @@
   AfterShutdown();
 }
 
 WebKit::WebKitClient* GetWebKitClient() {
   DCHECK(test_environment);
   return test_environment->webkit_client();
 }
 
 WebPlugin* CreateWebPlugin(WebFrame* frame,
                            const WebPluginParams& params) {
-  return new WebPluginImplWithPageDelegate(frame, params);
+  const bool kAllowWildcard = true;
+  WebPluginInfo info;
+  std::string actual_mime_type;
+  if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
+          params.url, params.mimeType.utf8(), kAllowWildcard, &info,
+          &actual_mime_type)) {
+    return NULL;
+  }
+
+  if (actual_mime_type.empty())
+    actual_mime_type = params.mimeType.utf8();
+
+  return new WebPluginImplWithPageDelegate(
+      frame, params, info.path, actual_mime_type);
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
                                           WebMediaPlayerClient* client) {
   scoped_refptr<media::FilterFactoryCollection> factory =
       new media::FilterFactoryCollection();
 
   appcache::WebApplicationCacheHostImpl* appcache_host =
       appcache::WebApplicationCacheHostImpl::FromFrame(frame);
 
@@ skipping 154 matching lines @@
 }
 
 WebKit::WebThemeEngine* GetThemeEngine() {
   DCHECK(test_environment);
   return test_environment->theme_engine();
 }
 
 #endif
 
 }  // namespace webkit_support