Move PluginServiceFilterParams to plugin_service_impl.h

BUG=98716
R=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9677023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126294 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 20 insertions, 24 deletions

diff --git a/content/browser/plugin_service_filter.h b/content/browser/plugin_service_filter.h
index cb86219..49aaaa2 100644
--- a/content/browser/plugin_service_filter.h
+++ b/content/browser/plugin_service_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -14,17 +14,6 @@ struct WebPluginInfo;
 
 namespace content {
 
-class ResourceContext;
-
-// base::Bind() has limited arity, and the filter-related methods tend to
-// surpass that limit.
-struct PluginServiceFilterParams {
-  int render_process_id;
-  int render_view_id;
-  GURL page_url;
-  ResourceContext* resource_context;
-};
-
 // Callback class to let the client filter the list of all installed plug-ins.
 // This class is called on the FILE thread.
 class PluginServiceFilter {
@@ -33,13 +22,12 @@ class PluginServiceFilter {
 
   // Whether to use |plugin|. The client can return false to disallow the
   // plugin, or return true and optionally change the passed in plugin.
-  virtual bool ShouldUsePlugin(
-      int render_process_id,
-      int render_view_id,
-      const void* context,
-      const GURL& url,
-      const GURL& policy_url,
-      webkit::WebPluginInfo* plugin) = 0;
+  virtual bool ShouldUsePlugin(int render_process_id,
+                               int render_view_id,
+                               const void* context,
+                               const GURL& url,
+                               const GURL& policy_url,
+                               webkit::WebPluginInfo* plugin) = 0;
 };
 
 }  // namespace content
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc
index 45341dc..c2a9b34 100644
--- a/content/browser/plugin_service_impl.cc
+++ b/content/browser/plugin_service_impl.cc
@@ -328,7 +328,7 @@ void PluginServiceImpl::OpenChannelToNpapiPlugin(
   pending_plugin_clients_.insert(client);
 
   // Make sure plugins are loaded if necessary.
-  content::PluginServiceFilterParams params = {
+  PluginServiceFilterParams params = {
     render_process_id,
     render_view_id,
     page_url,
@@ -368,7 +368,7 @@ void PluginServiceImpl::CancelOpenChannelToNpapiPlugin(
 }
 
 void PluginServiceImpl::ForwardGetAllowedPluginForOpenChannelToPlugin(
-    const content::PluginServiceFilterParams& params,
+    const PluginServiceFilterParams& params,
     const GURL& url,
     const std::string& mime_type,
     PluginProcessHost::Client* client,
diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h
index 4b6976d..be36075 100644
--- a/content/browser/plugin_service_impl.h
+++ b/content/browser/plugin_service_impl.h
@@ -47,10 +47,9 @@ class MessageLoopProxy;
 
 namespace content {
 class BrowserContext;
+class PluginServiceFilter;
 class ResourceContext;
 struct PepperPluginInfo;
-class PluginServiceFilter;
-struct PluginServiceFilterParams;
 }
 
 namespace webkit {
@@ -60,6 +59,15 @@ class PluginList;
 }
 }
 
+// base::Bind() has limited arity, and the filter-related methods tend to
+// surpass that limit.
+struct PluginServiceFilterParams {
+  int render_process_id;
+  int render_view_id;
+  GURL page_url;
+  content::ResourceContext* resource_context;
+};
+
 class CONTENT_EXPORT PluginServiceImpl
     : NON_EXPORTED_BASE(public content::PluginService),
       public base::WaitableEventWatcher::Delegate,
@@ -175,7 +183,7 @@ class CONTENT_EXPORT PluginServiceImpl
   // Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible
   // because more arity is needed <http://crbug.com/98542>. This just forwards.
   void ForwardGetAllowedPluginForOpenChannelToPlugin(
-      const content::PluginServiceFilterParams& params,
+      const PluginServiceFilterParams& params,
       const GURL& url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,