Wire up a PPAPI host in content/browser.

content/browser/renderer_host/pepper/pepper_message_filter.h

Index: content/browser/renderer_host/pepper/pepper_message_filter.h
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h
index fc6217cb52a6215b5c944243e29bdf755b3cba90..c1cb7aa266ad88180bcdeae16cf46202f5e6211f 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
@@ -16,6 +16,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/time.h"
+#include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/net_util.h"
@@ -23,6 +24,8 @@
 #include "net/socket/stream_socket.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
+#include "ppapi/host/ppapi_host.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
 
 class PepperTCPServerSocket;
 class PepperTCPSocket;
@@ -69,7 +72,9 @@ class PepperMessageFilter
 
   // Constructor when used in the context of a PPAPI process (the argument is
   // provided for sanity checking).
-  PepperMessageFilter(ProcessType type, net::HostResolver* host_resolver);
+  PepperMessageFilter(ProcessType type,
+                      net::HostResolver* host_resolver,
+                      const ppapi::PpapiPermissions& perms);
 
   // content::BrowserMessageFilter methods.
   virtual void OverrideThreadForMessage(
@@ -237,6 +242,11 @@ class PepperMessageFilter
   // When non-NULL, this should be used instead of the host_resolver_.
   content::ResourceContext* const resource_context_;
 
+  ppapi::PpapiPermissions permissions_;
+
+  content::ContentBrowserPepperHostFactory host_factory_;
+  ppapi::host::PpapiHost ppapi_host_;
+
   // When non-NULL, this should be used instead of the resource_context_. Use
   // GetHostResolver instead of accessing directly.
   net::HostResolver* host_resolver_;