Make the PPP wrappers take an Instance*.

ppapi/cpp/instance.h

 // Copyright (c) 2012 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_CPP_INSTANCE_H_
 #define PPAPI_CPP_INSTANCE_H_
 
 /// @file
 /// This file defines the C++ wrapper for an instance.
 
@@ skipping 469 matching lines @@
   /// get the C calls in the first place.
   ///
   /// Refer to RemovePerInstanceObject() and GetPerInstanceObject() for further
   /// information.
   ///
   /// @param[in] interface_name The name of the interface to associate with the
   /// instance
   /// @param[in] object
   void AddPerInstanceObject(const std::string& interface_name, void* object);
 
-  /// Static version of AddPerInstanceObject that takes an InstanceHandle. As
-  /// with all other instance functions, this must only be called on the main
-  /// thread.
-  static void AddPerInstanceObject(const InstanceHandle& instance,
-                                   const std::string& interface_name,
-                                   void* object);
-
   // {PENDING: summarize Remove method here}
   ///
   /// Refer to AddPerInstanceObject() for further information.
   ///
   /// @param[in] interface_name The name of the interface to associate with the
   /// instance
   /// @param[in] object
   void RemovePerInstanceObject(const std::string& interface_name, void* object);
 
   /// Static version of AddPerInstanceObject that takes an InstanceHandle. As
@@ skipping 18 matching lines @@
  private:
   PP_Instance pp_instance_;
 
   typedef std::map<std::string, void*> InterfaceNameToObjectMap;
   InterfaceNameToObjectMap interface_name_to_objects_;
 };
 
 }  // namespace pp
 
 #endif  // PPAPI_CPP_INSTANCE_H_