Pepper: Unify Buffer and BufferTrusted APIs.

content/renderer/pepper/pepper_video_capture_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_video_capture_host.h"
 
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/host_resource.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
 #include "webkit/plugins/ppapi/host_globals.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 using ppapi::HostResource;
 using ppapi::TrackedCallback;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Buffer_API;
-using ppapi::thunk::PPB_BufferTrusted_API;
 using webkit::ppapi::HostGlobals;
 using webkit::ppapi::PPB_Buffer_Impl;
 
 namespace {
 
 // Maximum number of buffers to actually allocate.
 const uint32_t kMaxBuffers = 20;
 
 }  // namespace
 
@@ skipping 164 matching lines @@
       host_resource.SetHostResource(pp_instance(), res);
       buffer_host_resources.push_back(host_resource);
 
       // Add a reference for the plugin, which is resposible for releasing it.
       tracker->AddRefResource(res);
     }
 
     // Add the serialized shared memory handle to params. FileDescriptor is
     // treated in special case.
     {
-      EnterResourceNoLock<PPB_BufferTrusted_API> enter(res, true);
+      EnterResourceNoLock<PPB_Buffer_API> enter(res, true);
       DCHECK(enter.succeeded());
       int handle;
       int32_t result = enter.object()->GetSharedMemory(&handle);
       DCHECK(result == PP_OK);
       // TODO(piman/brettw): Change trusted interface to return a PP_FileHandle,
       // those casts are ugly.
       base::PlatformFile platform_file =
 #if defined(OS_WIN)
           reinterpret_cast<HANDLE>(static_cast<intptr_t>(handle));
 #elif defined(OS_POSIX)
@@ skipping 201 matching lines @@
 PepperVideoCaptureHost::BufferInfo::BufferInfo()
     : in_use(false),
       data(NULL),
       buffer() {
 }
 
 PepperVideoCaptureHost::BufferInfo::~BufferInfo() {
 }
 
 }  // namespace content