Reland http://codereview.chromium.org/7452002/ again

webkit/plugins/ppapi/resource_tracker_unittest.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/ppapi_unittest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "third_party/npapi/bindings/npruntime.h"
@@ skipping 123 matching lines @@
   // Now we have two refs, derefing twice should delete the object.
   tracker().UnrefResource(resource_id);
   ASSERT_EQ(1, TrackedMockResource::tracked_objects_alive);
   tracker().UnrefResource(resource_id);
   ASSERT_EQ(0, TrackedMockResource::tracked_objects_alive);
 }
 
 TEST_F(ResourceTrackerTest, DeleteResourceWithInstance) {
   // Make a second instance (the test harness already creates & manages one).
   scoped_refptr<PluginInstance> instance2(
-      PluginInstance::Create0_5(delegate(), module(),
-                                GetMockInterface(PPP_INSTANCE_INTERFACE_0_5)));
+      PluginInstance::Create1_0(delegate(), module(),
+                                GetMockInterface(PPP_INSTANCE_INTERFACE_1_0)));
   PP_Instance pp_instance2 = instance2->pp_instance();
 
   // Make two resources and take refs on behalf of the "plugin" for each.
   scoped_refptr<TrackedMockResource> resource1(
       new TrackedMockResource(instance2));
   resource1->GetReference();
   scoped_refptr<TrackedMockResource> resource2(
       new TrackedMockResource(instance2));
   resource2->GetReference();
 
@@ skipping 12 matching lines @@
   // should have a NULL instance.
   ASSERT_FALSE(resource1->instance());
   ASSERT_EQ(1, TrackedMockResource::tracked_objects_alive);
   resource1 = NULL;
   ASSERT_EQ(0, TrackedMockResource::tracked_objects_alive);
 }
 
 TEST_F(ResourceTrackerTest, DeleteObjectVarWithInstance) {
   // Make a second instance (the test harness already creates & manages one).
   scoped_refptr<PluginInstance> instance2(
-      PluginInstance::Create0_5(delegate(), module(),
-                                GetMockInterface(PPP_INSTANCE_INTERFACE_0_5)));
+      PluginInstance::Create1_0(delegate(), module(),
+                                GetMockInterface(PPP_INSTANCE_INTERFACE_1_0)));
   PP_Instance pp_instance2 = instance2->pp_instance();
 
   // Make an object var.
   scoped_ptr<NPObject> npobject(NewTrackedNPObject());
   ObjectVar::NPObjectToPPVar(instance2.get(), npobject.get());
 
   EXPECT_EQ(1, g_npobjects_alive);
   EXPECT_EQ(1u, tracker().GetLiveObjectsForInstance(pp_instance2));
 
   // Free the instance, this should release the ObjectVar.
@@ skipping 28 matching lines @@
 
   // Releasing the resource should free the internal ref, and so making a new
   // one now should generate a new ID.
   PP_Var pp_object3 = ObjectVar::NPObjectToPPVar(instance(), npobject.get());
   EXPECT_NE(pp_object1.value.as_id, pp_object3.value.as_id);
   tracker().UnrefVar(static_cast<int32_t>(pp_object3.value.as_id));
 }
 
 }  // namespace ppapi
 }  // namespace webkit