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

ppapi/thunk/enter.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_THUNK_ENTER_H_
 #define PPAPI_THUNK_ENTER_H_
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_id.h"
@@ skipping 34 matching lines @@
         instance, FunctionsT::interface_id);
     if (base)
       functions_ = base->GetAs<FunctionsT>();
     // TODO(brettw) check error and if report_error is set, do something.
   }
   ~EnterFunction() {}
 
   bool succeeded() const { return !!functions_; }
   bool failed() const { return !functions_; }
 
-  PP_Instance instance() const { return instance_; }
   FunctionsT* functions() { return functions_; }
 
  private:
-  PP_Instance instance_;
   FunctionsT* functions_;
 
   DISALLOW_COPY_AND_ASSIGN(EnterFunction);
 };
 
 // Like EnterResource but assumes the lock is already held.
 // TODO(brettw) actually implement locks, this is just a placeholder for now.
 template<typename FunctionsT>
 class EnterFunctionNoLock : public EnterFunction<FunctionsT> {
  public:
   EnterFunctionNoLock(PP_Instance instance, bool report_error)
       : EnterFunction<FunctionsT>(instance, report_error) {
     // TODO(brettw) assert the lock is held.
   }
 };
 
-// Used when a caller has a resource, and wants to do EnterFunction for the
-// instance corresponding to that resource.
-template<typename FunctionsT>
-class EnterFunctionGivenResource : public EnterFunction<FunctionsT> {
- public:
-  EnterFunctionGivenResource(PP_Resource resource, bool report_error)
-      : EnterFunction<FunctionsT>(
-            TrackerBase::Get()->GetInstanceForResource(resource),
-            report_error) {
-  }
-};
-
-// EnterResource ---------------------------------------------------------------
-
 template<typename ResourceT>
 class EnterResource {
  public:
   EnterResource(PP_Resource resource, bool report_error)
       : object_(NULL) {
     ResourceObjectBase* base = TrackerBase::Get()->GetResourceAPI(resource);
     if (base)
       object_ = base->GetAs<ResourceT>();
     // TODO(brettw) check error and if report_error is set, do something.
   }
@@ skipping 18 matching lines @@
   EnterResourceNoLock(PP_Resource resource, bool report_error)
       : EnterResource<ResourceT>(resource, report_error) {
     // TODO(brettw) assert the lock is held.
   }
 };
 
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_ENTER_H_