Create a public API around webkit::ppapi::PluginInstance and use it in chrome. After this, webkit/p…

content/renderer/pepper/pepper_url_loader_host.cc

 // Copyright (c) 2013 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.
 
 #include "content/renderer/pepper/pepper_url_loader_host.h"
 
-#include "content/public/renderer/renderer_ppapi_host.h"
+#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "content/renderer/pepper/url_response_info_util.h"
 #include "net/base/net_errors.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebURLLoaderOptions.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
 #include "webkit/plugins/ppapi/url_request_info_util.h"
 
 using WebKit::WebFrame;
 using WebKit::WebString;
 using WebKit::WebURL;
 using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderOptions;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 namespace content {
 
-PepperURLLoaderHost::PepperURLLoaderHost(RendererPpapiHost* host,
+PepperURLLoaderHost::PepperURLLoaderHost(RendererPpapiHostImpl* host,
                                          bool main_document_loader,
                                          PP_Instance instance,
                                          PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       renderer_ppapi_host_(host),
       main_document_loader_(main_document_loader),
       has_universal_access_(false),
       bytes_sent_(0),
       total_bytes_to_be_sent_(-1),
       bytes_received_(0),
@@ skipping 19 matching lines @@
   // we don't want to cancel other loads when the main one is closed.
   //
   // "Leaking" the main document load here by not closing it will only affect
   // plugins handling main document loads (which are very few, mostly only PDF)
   // that dereference without explicitly closing the main document load (which
   // PDF doesn't do -- it explicitly closes it before issuing the second
   // request). And the worst thing that will happen is that any remaining data
   // will get queued inside WebKit.
   if (main_document_loader_) {
     // The PluginInstance has a non-owning pointer to us.
-    webkit::ppapi::PluginInstance* instance_object =
-        renderer_ppapi_host_->GetPluginInstance(pp_instance());
+    webkit::ppapi::PluginInstanceImpl* instance_object =
+        renderer_ppapi_host_->GetPluginInstanceImpl(pp_instance());
     if (instance_object) {
       DCHECK(instance_object->document_loader() == this);
       instance_object->set_document_loader(NULL);
     }
   }
 
   // There is a path whereby the destructor for the loader_ member can
   // invoke InstanceWasDeleted() upon this URLLoaderResource, thereby
   // re-entering the scoped_ptr destructor with the same scoped_ptr object
   // via loader_.reset(). Be sure that loader_ is first NULL then destroy
@@ skipping 230 matching lines @@
     loader_->cancel();
   else if (main_document_loader_)
     GetFrame()->stopLoading();
 }
 
 WebKit::WebFrame* PepperURLLoaderHost::GetFrame() {
   webkit::ppapi::PluginInstance* instance_object =
       renderer_ppapi_host_->GetPluginInstance(pp_instance());
   if (!instance_object)
     return NULL;
-  return instance_object->container()->element().document().frame();
+  return instance_object->GetContainer()->element().document().frame();
 }
 
 void PepperURLLoaderHost::SetDefersLoading(bool defers_loading) {
   if (loader_.get())
     loader_->setDefersLoading(defers_loading);
 
   // TODO(brettw) bug 96770: We need a way to set the defers loading flag on
   // main document loads (when the loader_ is null).
 }
 
@@ skipping 22 matching lines @@
     ppapi::proxy::ResourceMessageReplyParams params;
     SendUpdateToPlugin(new PpapiPluginMsg_URLLoader_UpdateProgress(
             record_upload ? bytes_sent_ : -1,
             record_upload ? total_bytes_to_be_sent_ : -1,
             record_download ? bytes_received_ : -1,
             record_download ? total_bytes_to_be_received_ : -1));
   }
 }
 
 }  // namespace content