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

webkit/plugins/ppapi/resource_tracker.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_RESOURCE_TRACKER_H_
 #define WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 41 matching lines @@
   // Increment resource's plugin refcount. See ResourceAndRefCount comments
   // below.
   bool AddRefResource(PP_Resource res);
   bool UnrefResource(PP_Resource res);
 
   // Returns the number of resources associated with this module.
   uint32 GetLiveObjectsForInstance(PP_Instance instance) const;
 
   // ResourceTrackerBase.
   virtual ::ppapi::ResourceObjectBase* GetResourceAPI(
-      PP_Resource res) OVERRIDE;
+      PP_Resource res);
   virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
       PP_Instance pp_instance,
-      pp::proxy::InterfaceID id) OVERRIDE;
-  virtual PP_Instance GetInstanceForResource(PP_Resource resource) OVERRIDE;
+      pp::proxy::InterfaceID id);
 
   // PP_Vars -------------------------------------------------------------------
 
   scoped_refptr<Var> GetVar(int32 var_id) const;
 
   bool AddRefVar(int32 var_id);
   bool UnrefVar(int32 var_id);
 
   // PP_Modules ----------------------------------------------------------------
 
@@ skipping 113 matching lines @@
   typedef std::map<PP_Module, PluginModule*> ModuleMap;
   ModuleMap module_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceTracker);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_RESOURCE_TRACKER_H_