Revert 87415 - Convert more interfaces to the new thunk system. This goes up to and including

ppapi/proxy/ppb_image_data_proxy.cc

 // Copyright (c) 2011 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/ppb_image_data_proxy.h"
 
 #include <string.h>  // For memcpy
 
 #include <vector>
 
@@ skipping 58 matching lines @@
 #if defined(OS_WIN)
   transport_dib_.reset(TransportDIB::CreateWithHandle(handle));
 #else
   transport_dib_.reset(TransportDIB::Map(handle));
 #endif
 }
 
 ImageData::~ImageData() {
 }
 
-::ppapi::thunk::PPB_ImageData_API* ImageData::AsPPB_ImageData_API() {
+::ppapi::thunk::PPB_ImageData_API* ImageData::AsImageData_API() {
   return this;
 }
 
 ImageData* ImageData::AsImageData() {
   return this;
 }
 
 PP_Bool ImageData::Describe(PP_ImageDataDesc* desc) {
   memcpy(desc, &desc_, sizeof(PP_ImageDataDesc));
   return PP_TRUE;
@@ skipping 32 matching lines @@
     return reinterpret_cast<ImageHandle>(i);
 #elif defined(OS_MACOSX)
     return ImageHandle(i, false);
 #else
     return static_cast<ImageHandle>(i);
 #endif
 }
 
 }  // namespace proxy
 }  // namespace pp