Make the PPP wrappers take an Instance*.

ppapi/cpp/instance.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/cpp/instance.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
@@ skipping 120 matching lines @@
 
 void Instance::AddPerInstanceObject(const std::string& interface_name,
                                     void* object) {
   // Ensure we're not trying to register more than one object per interface
   // type. Otherwise, we'll get confused in GetPerInstanceObject.
   PP_DCHECK(interface_name_to_objects_.find(interface_name) ==
             interface_name_to_objects_.end());
   interface_name_to_objects_[interface_name] = object;
 }
 
-// static
-void Instance::AddPerInstanceObject(const InstanceHandle& instance,
-                                    const std::string& interface_name,
-                                    void* object) {
-  // TODO(brettw) assert we're on the main thread (instance is not threadsafe
-  // and may be deleted from the main thread).
-  Instance* that = Module::Get()->InstanceForPPInstance(instance.pp_instance());
-  if (!that)
-    return;
-  that->AddPerInstanceObject(interface_name, object);
-}
-
 void Instance::RemovePerInstanceObject(const std::string& interface_name,
                                        void* object) {
   InterfaceNameToObjectMap::iterator found = interface_name_to_objects_.find(
       interface_name);
   if (found == interface_name_to_objects_.end()) {
     // Attempting to unregister an object that doesn't exist or was already
     // unregistered.
     PP_DCHECK(false);
     return;
   }
@@ skipping 23 matching lines @@
   if (!that)
     return NULL;
   InterfaceNameToObjectMap::iterator found =
       that->interface_name_to_objects_.find(interface_name);
   if (found == that->interface_name_to_objects_.end())
     return NULL;
   return found->second;
 }
 
 }  // namespace pp