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

ppapi/proxy/ppb_image_data_proxy.h

 // 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.
 
 #ifndef PPAPI_PPB_IMAGE_DATA_PROXY_H_
 #define PPAPI_PPB_IMAGE_DATA_PROXY_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
@@ skipping 37 matching lines @@
 class ImageData : public PluginResource,
                   public ::ppapi::thunk::PPB_ImageData_API,
                   public ppapi::ImageDataImpl {
  public:
   ImageData(const HostResource& resource,
             const PP_ImageDataDesc& desc,
             ImageHandle handle);
   virtual ~ImageData();
 
   // ResourceObjectBase overrides.
-  virtual ::ppapi::thunk::PPB_ImageData_API* AsPPB_ImageData_API();
+  virtual ::ppapi::thunk::PPB_ImageData_API* AsImageData_API();
 
   // Resource overrides.
   virtual ImageData* AsImageData();
 
   // PPB_ImageData API.
   virtual PP_Bool Describe(PP_ImageDataDesc* desc);
   virtual void* Map();
   virtual void Unmap();
 
   skia::PlatformCanvas* mapped_canvas() const { return mapped_canvas_.get(); }
@@ skipping 11 matching lines @@
   // Null when the image isn't mapped.
   scoped_ptr<skia::PlatformCanvas> mapped_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageData);
 };
 
 }  // namespace proxy
 }  // namespace pp
 
 #endif  // PPAPI_PPB_IMAGE_DATA_PROXY_H_