Refactoring of new IPC-only pepper implementation

content/renderer/pepper/content_renderer_pepper_host_factory.cc

Index: content/renderer/pepper/content_renderer_pepper_host_factory.cc
diff --git a/content/renderer/pepper/content_renderer_pepper_host_factory.cc b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
index ec7e7ca12f1f6d8018675a6877d002d6edfeaef7..d5eb200d2658ed11789756b6348e42968433d08d 100644
--- a/content/renderer/pepper/content_renderer_pepper_host_factory.cc
+++ b/content/renderer/pepper/content_renderer_pepper_host_factory.cc
@@ -4,8 +4,9 @@
 
 #include "content/renderer/pepper/content_renderer_pepper_host_factory.h"
 
-#include "content/renderer/pepper/pepper_instance_state_accessor.h"
+#include "base/logging.h"
 #include "content/renderer/pepper/pepper_file_chooser_host.h"
+#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
@@ -14,12 +15,8 @@ using ppapi::host::ResourceHost;
 namespace content {
 
 ContentRendererPepperHostFactory::ContentRendererPepperHostFactory(
-    RenderViewImpl* render_view,
-    const ppapi::PpapiPermissions& permissions,
-    PepperInstanceStateAccessor* state)
-    : render_view_(render_view),
-      permissions_(permissions),
-      instance_state_(state) {
+    RendererPpapiHostImpl* host)
+    : host_(host) {
 }
 
 ContentRendererPepperHostFactory::~ContentRendererPepperHostFactory() {
@@ -30,22 +27,28 @@ scoped_ptr<ResourceHost> ContentRendererPepperHostFactory::CreateResourceHost(
     const ppapi::proxy::ResourceMessageCallParams& params,
     PP_Instance instance,
     const IPC::Message& message) {
+  DCHECK(host == host_->GetPpapiHost());
+
   // Make sure the plugin is giving us a valid instance for this resource.
-  if (!instance_state_->IsValidInstance(instance))
+  if (!host_->IsValidInstance(instance))
     return scoped_ptr<ResourceHost>();
 
   // Resources for dev interfaces.
   // TODO(brettw) when we support any public or private interfaces, put them in
   // a separate switch above.
-  if (permissions_.HasPermission(ppapi::PERMISSION_DEV)) {
+  if (GetPermissions().HasPermission(ppapi::PERMISSION_DEV)) {
     switch (message.type()) {
       case PpapiHostMsg_FileChooser_Create::ID:
         return scoped_ptr<ResourceHost>(new PepperFileChooserHost(
-            host, instance, params.pp_resource(), render_view_,
-            instance_state_));
+            host_, instance, params.pp_resource()));
     }
   }
   return scoped_ptr<ResourceHost>();
 }
 
+const ppapi::PpapiPermissions&
+ContentRendererPepperHostFactory::GetPermissions() const {
+  return host_->GetPpapiHost()->permissions();
+}
+
 }  // namespace content