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

webkit/plugins/ppapi/ppb_broker_impl.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 WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/weak_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
@@ skipping 14 matching lines @@
                         public base::SupportsWeakPtr<PPB_Broker_Impl> {
  public:
   virtual ~PPB_Broker_Impl();
 
   static PP_Resource Create(PP_Instance instance_id);
 
   // Resource override.
   virtual PPB_Broker_Impl* AsPPB_Broker_Impl() OVERRIDE;
 
   // ResourceObjectBase override.
-  virtual ::ppapi::thunk::PPB_Broker_API* AsPPB_Broker_API() OVERRIDE;
+  virtual ::ppapi::thunk::PPB_Broker_API* AsBroker_API() OVERRIDE;
 
   // PPB_BrokerTrusted implementation.
   virtual int32_t Connect(PP_CompletionCallback connect_callback) OVERRIDE;
   virtual int32_t GetHandle(int32_t* handle) OVERRIDE;
 
   void BrokerConnected(int32_t handle, int32_t result);
 
  private:
   explicit PPB_Broker_Impl(PluginInstance* instance);
 
   // PluginDelegate ppapi broker object.
   // We don't own this pointer but are responsible for calling Disconnect on it.
   PluginDelegate::PpapiBroker* broker_;
 
   // Callback invoked from BrokerConnected.
   scoped_refptr<TrackedCompletionCallback> connect_callback_;
 
   // Pipe handle for the plugin instance to use to communicate with the broker.
   // Never owned by this object.
   int32_t pipe_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Broker_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_BROKER_IMPL_H_