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

ppapi/tests/test_var_deprecated.cc

 // Copyright (c) 2010 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/tests/test_var_deprecated.h"
 
 #include <string.h>
 
 #include <limits>
 
@@ skipping 29 matching lines @@
   RUN_TEST(InvalidAndEmpty);
   RUN_TEST(InvalidUtf8);
   RUN_TEST(NullInputInUtf8Conversion);
   RUN_TEST(ValidUtf8);
   RUN_TEST(Utf8WithEmbeddedNulls);
   RUN_TEST(VarToUtf8ForWrongType);
   RUN_TEST(HasPropertyAndMethod);
 }
 
 std::string TestVarDeprecated::TestBasicString() {
-  uint32_t before_object = testing_interface_->GetLiveObjectCount(
+  uint32_t before_object = testing_interface_->GetLiveObjectsForInstance(
       pp::Module::Get()->pp_module());

[piman, 2011/01/20 00:26:23]

pp::Module::Get()->pp_module() -> instance_->pp_instance()

   {
     const uint32_t kStrLen = 5;
     const char kStr[kStrLen + 1] = "Hello";
     PP_Var str = var_interface_->VarFromUtf8(pp::Module::Get()->pp_module(),
                                              kStr, sizeof(kStr) - 1);
     ASSERT_EQ(PP_VARTYPE_STRING, str.type);
 
     // Reading back the string should work.
     uint32_t len = 0;
     const char* result = var_interface_->VarToUtf8(str, &len);
     ASSERT_EQ(kStrLen, len);
     ASSERT_EQ(0, strncmp(kStr, result, kStrLen));
 
     // Destroy the string, readback should now fail.
     var_interface_->Release(str);
     result = var_interface_->VarToUtf8(str, &len);
     ASSERT_EQ(0, len);
     ASSERT_EQ(NULL, result);
   }
 
   // Make sure nothing leaked.
-  ASSERT_TRUE(testing_interface_->GetLiveObjectCount(
-      pp::Module::Get()->pp_module()) == before_object);
+  ASSERT_TRUE(testing_interface_->GetLiveObjectsForInstance(
+      instance_->pp_instance()) == before_object);
 
   PASS();
 }
 
 std::string TestVarDeprecated::TestInvalidAndEmpty() {
   PP_Var invalid_string;
   invalid_string.type = PP_VARTYPE_STRING;
   invalid_string.value.as_id = 31415926;
 
   // Invalid strings should give NULL as the return value.
@@ skipping 159 matching lines @@
     return "Expected 0 on string conversion from Double var.";
   }
   if (result != NULL) {
     return "Expected NULL on string conversion from Double var.";
   }
 
   PASS();
 }
 
 std::string TestVarDeprecated::TestHasPropertyAndMethod() {
-  uint32_t before_objects = testing_interface_->GetLiveObjectCount(
-      pp::Module::Get()->pp_module());
+  uint32_t before_objects = testing_interface_->GetLiveObjectsForInstance(
+      instance_->pp_instance());
   {
     pp::Var window = instance_->GetWindowObject();
     ASSERT_TRUE(window.is_object());
 
     // Regular property.
     pp::Var exception;
     ASSERT_TRUE(window.HasProperty("scrollX", &exception));
     ASSERT_TRUE(exception.is_undefined());
     ASSERT_FALSE(window.HasMethod("scrollX", &exception));
     ASSERT_TRUE(exception.is_undefined());
@@ skipping 48 matching lines @@
 
     // Get a valid property/method when the exception is set returns false.
     exception = pp::Var("Bad something-or-other exception");
     ASSERT_FALSE(window.HasProperty("find", &exception));
     ASSERT_FALSE(exception.is_undefined());
     ASSERT_FALSE(window.HasMethod("find", &exception));
     ASSERT_FALSE(exception.is_undefined());
   }
 
   // Make sure nothing leaked.
-  ASSERT_TRUE(testing_interface_->GetLiveObjectCount(
-      pp::Module::Get()->pp_module()) == before_objects);
+  ASSERT_TRUE(testing_interface_->GetLiveObjectsForInstance(
+      instance_->pp_instance()) == before_objects);
 
   PASS();
 }