First pass at making the proxy handle multiple renderers. This associates the...

webkit/plugins/ppapi/plugin_module.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 "webkit/plugins/ppapi/plugin_module.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
@@ skipping 173 matching lines @@
   bool old_state = MessageLoop::current()->NestableTasksAllowed();
   MessageLoop::current()->SetNestableTasksAllowed(true);
   MessageLoop::current()->Run();
   MessageLoop::current()->SetNestableTasksAllowed(old_state);
 }
 
 void QuitMessageLoop() {
   MessageLoop::current()->QuitNow();
 }
 
-uint32_t GetLiveObjectCount(PP_Module module_id) {
-  PluginModule* module = ResourceTracker::Get()->GetModule(module_id);
-  if (!module)
-    return static_cast<uint32_t>(-1);
-  return ResourceTracker::Get()->GetLiveObjectsForModule(module);
+uint32_t GetLiveObjectsForInstance(PP_Instance instance_id) {
+  return ResourceTracker::Get()->GetLiveObjectsForInstance(instance_id);
 }
 
 const PPB_Testing_Dev testing_interface = {
   &ReadImageData,
   &RunMessageLoop,
   &QuitMessageLoop,
-  &GetLiveObjectCount
+  &GetLiveObjectsForInstance
 };
 
 // GetInterface ----------------------------------------------------------------
 
 const void* GetInterface(const char* name) {
   // Please keep alphabetized by interface macro name with "special" stuff at
   // the bottom.
   if (strcmp(name, PPB_AUDIO_CONFIG_INTERFACE) == 0)
     return PPB_AudioConfig_Impl::GetInterface();
   if (strcmp(name, PPB_AUDIO_INTERFACE) == 0)
@@ skipping 256 matching lines @@
   if (retval != 0) {
     LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
     return false;
   }
   return true;
 }
 
 }  // namespace ppapi
 }  // namespace webkit