Create an API around UtilityProcessHost and use that from chrome.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9317074

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

1 files changed, 11 insertions, 8 deletions

diff --git a/content/browser/plugin_loader_posix.h b/content/browser/plugin_loader_posix.h
index cc5408e..7db8b8b0 100644
--- a/content/browser/plugin_loader_posix.h
+++ b/content/browser/plugin_loader_posix.h
@@ -8,20 +8,22 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "content/browser/plugin_service_impl.h"
-#include "content/browser/utility_process_host.h"
+#include "content/public/browser/utility_process_host_client.h"
 #include "ipc/ipc_message.h"
 #include "webkit/plugins/webplugininfo.h"
 
-class FilePath;
-class UtilityProcessHost;
-
 namespace base {
 class MessageLoopProxy;
 }
 
+namespace content {
+class UtilityProcessHost;
+}
+
 // This class is responsible for managing the out-of-process plugin loading on
 // POSIX systems. It primarily lives on the IO thread, but has a brief stay on
 // the FILE thread to iterate over plugin directories when it is first
@@ -43,8 +45,9 @@ class MessageLoopProxy;
 // 5. This algorithm continues until the canonical list has been walked to the
 //    end, after which the list of loaded plugins is set on the PluginList and
 //    the completion callback is run.
-class CONTENT_EXPORT PluginLoaderPosix : public UtilityProcessHost::Client,
-                                                IPC::Message::Sender {
+class CONTENT_EXPORT PluginLoaderPosix
+    : public NON_EXPORTED_BASE(content::UtilityProcessHostClient),
+      public IPC::Message::Sender {
  public:
   PluginLoaderPosix();
 
@@ -53,7 +56,7 @@ class CONTENT_EXPORT PluginLoaderPosix : public UtilityProcessHost::Client,
       scoped_refptr<base::MessageLoopProxy> target_loop,
       const content::PluginService::GetPluginsCallback& callback);
 
-  // UtilityProcessHost::Client:
+  // UtilityProcessHostClient:
   virtual void OnProcessCrashed(int exit_code) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
@@ -92,7 +95,7 @@ class CONTENT_EXPORT PluginLoaderPosix : public UtilityProcessHost::Client,
   bool MaybeRunPendingCallbacks();
 
   // The process host for which this is a client.
-  base::WeakPtr<UtilityProcessHost> process_host_;
+  base::WeakPtr<content::UtilityProcessHost> process_host_;
 
   // A list of paths to plugins which will be loaded by the utility process, in
   // the order specified by this vector.