Move webplugininfo.h to content/public.

chrome/renderer/chrome_content_renderer_client.h

 // 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.
 
 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
 
 #include <string>
 #include <vector>
 
 #if defined(ENABLE_PLUGINS)
 #include <set>
 #endif
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "content/public/renderer/content_renderer_client.h"
 
 class ChromeRenderProcessObserver;
 class ExtensionSet;
 class PrescientNetworkingDispatcher;
 class RendererNetPredictor;
 class SpellCheck;
 class SpellCheckProvider;
 
 struct ChromeViewHostMsg_GetPluginInfo_Output;
 
+namespace content {
+struct WebPluginInfo;
+}
+
 namespace extensions {
 class Dispatcher;
 class Extension;
 class RendererPermissionsPolicyDelegate;
 }
 
 namespace prerender {
 class PrerenderDispatcher;
 }
 
 namespace safe_browsing {
 class PhishingClassifierFilter;
 }
 
 namespace visitedlink {
 class VisitedLinkSlave;
 }
 
-namespace webkit {
-struct WebPluginInfo;
-}
-
 namespace WebKit {
 class WebSecurityOrigin;
 }
 
 #if defined(ENABLE_WEBRTC)
 class WebRtcLoggingMessageFilter;
 #endif
 
 namespace chrome {
 
@@ skipping 108 matching lines @@
 
   // Returns true if the frame is navigating to an URL either into or out of an
   // extension app's extent.
   bool CrossesExtensionExtents(WebKit::WebFrame* frame,
                                const GURL& new_url,
                                const ExtensionSet& extensions,
                                bool is_extension_url,
                                bool is_initial_navigation);
 
   static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
-                                       const webkit::WebPluginInfo& plugin);
+                                       const content::WebPluginInfo& plugin);
   static bool IsNaClAllowed(const GURL& manifest_url,
                             const GURL& app_url,
                             bool is_nacl_unrestricted,
                             const extensions::Extension* extension,
                             WebKit::WebPluginParams* params);
 
   scoped_ptr<ChromeRenderProcessObserver> chrome_observer_;
   scoped_ptr<extensions::Dispatcher> extension_dispatcher_;
   scoped_ptr<extensions::RendererPermissionsPolicyDelegate>
       permissions_policy_delegate_;
   scoped_ptr<PrescientNetworkingDispatcher> prescient_networking_dispatcher_;
   scoped_ptr<RendererNetPredictor> net_predictor_;
   scoped_ptr<SpellCheck> spellcheck_;
   scoped_ptr<visitedlink::VisitedLinkSlave> visited_link_slave_;
   scoped_ptr<safe_browsing::PhishingClassifierFilter> phishing_classifier_;
   scoped_ptr<prerender::PrerenderDispatcher> prerender_dispatcher_;
 #if defined(ENABLE_WEBRTC)
   scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
 #endif
 
 #if defined(ENABLE_PLUGINS)
   std::set<std::string> allowed_file_handle_origins_;
 #endif
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_