Make o.o.p. proxy handle PPP_Instance versions 0.4 and 0.5.

webkit/plugins/ppapi/ppapi_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 "ppapi/c/pp_var.h"
 #include "ppapi/c/ppp_instance.h"
 #include "webkit/plugins/ppapi/mock_plugin_delegate.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
@@ skipping 72 matching lines @@
   delegate_.reset(new MockPluginDelegate);
 
   // Initialize the mock module.
   module_ = new PluginModule("Mock plugin", FilePath(), this);
   PluginModule::EntryPoints entry_points;
   entry_points.get_interface = &MockGetInterface;
   entry_points.initialize_module = &MockInitializeModule;
   ASSERT_TRUE(module_->InitAsInternalPlugin(entry_points));
 
   // Initialize the mock instance.
-  instance_ = new PluginInstance(delegate_.get(), module(),
-      PluginInstance::new_instance_interface<PPP_Instance>(
-          GetMockInterface(PPP_INSTANCE_INTERFACE)));
+  instance_ = PluginInstance::Create0_5(
+      delegate_.get(),
+      module(),
+      GetMockInterface(PPP_INSTANCE_INTERFACE_0_5));
+
 }
 
 void PpapiUnittest::TearDown() {
   instance_ = NULL;
   module_ = NULL;
 }
 
 const void* PpapiUnittest::GetMockInterface(const char* interface_name) const {
-  if (strcmp(interface_name, PPP_INSTANCE_INTERFACE) == 0)
+  if (strcmp(interface_name, PPP_INSTANCE_INTERFACE_0_5) == 0)
     return &mock_instance_interface;
   return NULL;
 }
 
 void PpapiUnittest::ShutdownModule() {
   DCHECK(instance_->HasOneRef());
   instance_ = NULL;
   DCHECK(module_->HasOneRef());
   module_ = NULL;
 }
@@ skipping 43 matching lines @@
   reset_result();
   PpapiInterfaceFactoryManager::GetInstance()->UnregisterFactory(
       PpapiCustomInterfaceFactoryTest::InterfaceFactory);
 
   (*PluginModule::GetLocalGetInterfaceFunc())("DummyInterface");
   EXPECT_FALSE(result());
 }
 
 }  // namespace ppapi
 }  // namespace webkit