Pepper: Unify Buffer and BufferTrusted APIs.

ppapi/proxy/ppp_content_decryptor_private_proxy.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 "ppapi/proxy/ppp_content_decryptor_private_proxy.h"
 
 #include "base/platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/content_decryptor_private_serializer.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_buffer_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/shared_impl/var_tracker.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
-#include "ppapi/thunk/ppb_buffer_trusted_api.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
-using ppapi::thunk::PPB_BufferTrusted_API;
 using ppapi::thunk::PPB_Instance_API;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 PP_Bool DescribeHostBufferResource(PP_Resource resource, uint32_t* size) {
   EnterResourceNoLock<PPB_Buffer_API> enter(resource, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->Describe(size);
 }
 
 // TODO(dmichael): Refactor so this handle sharing code is in one place.
 PP_Bool ShareHostBufferResourceToPlugin(
     HostDispatcher* dispatcher,
     PP_Resource resource,
     base::SharedMemoryHandle* shared_mem_handle) {
   if (!dispatcher || resource == 0 || !shared_mem_handle)
     return PP_FALSE;
-  EnterResourceNoLock<PPB_BufferTrusted_API> enter(resource, true);
+  EnterResourceNoLock<PPB_Buffer_API> enter(resource, true);
   if (enter.failed())
     return PP_FALSE;
   int handle;
   int32_t result = enter.object()->GetSharedMemory(&handle);
   if (result != PP_OK)
     return PP_FALSE;
   base::PlatformFile platform_file =
   #if defined(OS_WIN)
       reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
   #elif defined(OS_POSIX)
@@ skipping 514 matching lines @@
         ppp_decryptor_impl_->DecryptAndDecode,
         instance,
         decoder_type,
         plugin_resource.get(),
         const_cast<const PP_EncryptedBlockInfo*>(&block_info));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi