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

content/renderer/pepper/pepper_audio_input_host.cc

 // 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.
 
 #include "content/renderer/pepper/pepper_audio_input_host.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "content/public/renderer/renderer_ppapi_host.h"
+#include "content/renderer/pepper/renderer_ppapi_host_impl.h"
 #include "ipc/ipc_message.h"
 #include "media/audio/shared_memory_util.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_structs.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebPluginContainer.h"
-#include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_instance_impl.h"
 
 namespace content {
 
 namespace {
 
 base::PlatformFile ConvertSyncSocketHandle(const base::SyncSocket& socket) {
   return socket.handle();
 }
 
 base::PlatformFile ConvertSharedMemoryHandle(
     const base::SharedMemory& shared_memory) {
 #if defined(OS_POSIX)
   return shared_memory.handle().fd;
 #elif defined(OS_WIN)
   return shared_memory.handle();
 #else
 #error "Platform not supported."
 #endif
 }
 
 }  // namespace
 
 PepperAudioInputHost::PepperAudioInputHost(
-    RendererPpapiHost* host,
+    RendererPpapiHostImpl* host,
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       renderer_ppapi_host_(host),
       audio_input_(NULL),
       enumeration_helper_(this, this, PP_DEVICETYPE_DEV_AUDIOCAPTURE) {
 }
 
 PepperAudioInputHost::~PepperAudioInputHost() {
   Close();
@@ skipping 22 matching lines @@
     base::SyncSocket::Handle socket) {
   OnOpenComplete(PP_OK, shared_memory_handle, shared_memory_size, socket);
 }
 
 void PepperAudioInputHost::StreamCreationFailed() {
   OnOpenComplete(PP_ERROR_FAILED, base::SharedMemory::NULLHandle(), 0,
                  base::SyncSocket::kInvalidHandle);
 }
 
 webkit::ppapi::PluginDelegate* PepperAudioInputHost::GetPluginDelegate() {
-  webkit::ppapi::PluginInstance* instance =
-      renderer_ppapi_host_->GetPluginInstance(pp_instance());
+  webkit::ppapi::PluginInstanceImpl* instance =
+      renderer_ppapi_host_->GetPluginInstanceImpl(pp_instance());
   if (instance)
     return instance->delegate();
   return NULL;
 }
 
 int32_t PepperAudioInputHost::OnOpen(
     ppapi::host::HostMessageContext* context,
     const std::string& device_id,
     PP_AudioSampleRate sample_rate,
     uint32_t sample_frame_count) {
   if (open_context_)
     return PP_ERROR_INPROGRESS;
   if (audio_input_)
     return PP_ERROR_FAILED;
 
   webkit::ppapi::PluginDelegate* plugin_delegate = GetPluginDelegate();
   if (!plugin_delegate)
     return PP_ERROR_FAILED;
 
-  webkit::ppapi::PluginInstance* instance =
-      renderer_ppapi_host_->GetPluginInstance(pp_instance());
+  webkit::ppapi::PluginInstanceImpl* instance =
+      renderer_ppapi_host_->GetPluginInstanceImpl(pp_instance());
   if (!instance)
     return PP_ERROR_FAILED;
 
   // When it is done, we'll get called back on StreamCreated() or
   // StreamCreationFailed().
   audio_input_ = plugin_delegate->CreateAudioInput(
       device_id, instance->container()->element().document().url(),
       sample_rate, sample_frame_count, this);
   if (audio_input_) {
     open_context_.reset(new ppapi::host::ReplyMessageContext(
@@ skipping 98 matching lines @@
 
   if (open_context_) {
     open_context_->params.set_result(PP_ERROR_ABORTED);
     host()->SendReply(*open_context_, PpapiPluginMsg_AudioInput_OpenReply());
     open_context_.reset();
   }
 }
 
 }  // namespace content