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

ppapi/proxy/ppb_broker_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_broker_proxy.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/trusted/ppb_broker_trusted.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
@@ skipping 34 matching lines @@
 
 }  // namespace
 
 class Broker : public ppapi::thunk::PPB_Broker_API,
                public PluginResource {
  public:
   explicit Broker(const HostResource& resource);
   virtual ~Broker();
 
   // ResourceObjectBase overries.
-  virtual ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() OVERRIDE;
+  virtual ppapi::thunk::PPB_Broker_API* AsBroker_API() OVERRIDE;
 
   // PPB_Broker_API implementation.
   virtual int32_t Connect(PP_CompletionCallback connect_callback) OVERRIDE;
   virtual int32_t GetHandle(int32_t* handle) OVERRIDE;
 
   // Called by the proxy when the host side has completed the request.
   void ConnectComplete(IPC::PlatformFileForTransit socket_handle,
                        int32_t result);
 
  private:
@@ skipping 22 matching lines @@
     // TODO(brettw) the callbacks at this level should be refactored with a
     // more automatic tracking system like we have in the renderer.
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableFunction(
         current_connect_callback_.func, current_connect_callback_.user_data,
         static_cast<int32_t>(PP_ERROR_ABORTED)));
   }
 
   socket_handle_ = base::kInvalidPlatformFileValue;
 }
 
-ppapi::thunk::PPB_Broker_API* Broker::AsPPB_Broker_API() {
+ppapi::thunk::PPB_Broker_API* Broker::AsBroker_API() {
   return this;
 }
 
 int32_t Broker::Connect(PP_CompletionCallback connect_callback) {
   if (!connect_callback.func) {
     // Synchronous calls are not supported.
     return PP_ERROR_BADARGUMENT;
   }
 
   if (current_connect_callback_.func)
@@ skipping 163 matching lines @@
       // The easiest way to clean it up is to just put it in an object
       // and then close it. This failure case is not performance critical.
       // The handle could still leak if Send succeeded but the IPC later failed.
       base::SyncSocket temp_socket(
           IPC::PlatformFileForTransitToPlatformFile(foreign_socket_handle));
   }
 }
 
 }  // namespace proxy
 }  // namespace pp