Replaced BaseNPObject with DefaultNPObject because......

o3d/gpu_plugin/gpu_plugin_object_unittest.cc

 // Copyright (c) 2006-2008 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 "o3d/gpu_plugin/command_buffer_mock.h"
 #include "o3d/gpu_plugin/gpu_plugin_object.h"
-#include "o3d/gpu_plugin/np_utils/base_np_object_mock.h"
 #include "o3d/gpu_plugin/np_utils/np_browser_mock.h"
+#include "o3d/gpu_plugin/np_utils/np_object_mock.h"
 #include "o3d/gpu_plugin/np_utils/np_object_pointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/glue/plugins/nphostapi.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
@@ skipping 81 matching lines @@
 
 TEST_F(GPUPluginObjectTest, CanGetScriptableNPObject) {
   EXPECT_EQ(plugin_object_.Get(), plugin_object_->GetScriptableNPObject());
 }
 
 TEST_F(GPUPluginObjectTest, OpenCommandBufferReturnsInitializedCommandBuffer) {
   // Intercept creation of command buffer object and return mock.
   NPObjectPointer<MockCommandBuffer> command_buffer_object =
       NPCreateObject<StrictMock<MockCommandBuffer> >(NULL);
   EXPECT_CALL(mock_browser_, CreateObject(NULL,
-      BaseNPObject::GetNPClass<CommandBuffer>()))
+      NPGetClass<CommandBuffer>()))
     .WillOnce(Return(command_buffer_object.ToReturned()));
 
   EXPECT_CALL(*command_buffer_object.Get(), Initialize(1024))
     .WillOnce(Return(true));
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_object_->New("application/foo",
                                                 0,
                                                 NULL,
                                                 NULL,
                                                 NULL));
 
   EXPECT_EQ(command_buffer_object, plugin_object_->OpenCommandBuffer());
 
   // Calling OpenCommandBuffer again just returns the existing command buffer.
   EXPECT_EQ(command_buffer_object, plugin_object_->OpenCommandBuffer());
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_object_->Destroy(NULL));
 }
 
 TEST_F(GPUPluginObjectTest, OpenCommandBufferReturnsNullIfCannotInitialize) {
   // Intercept creation of command buffer object and return mock.
   NPObjectPointer<MockCommandBuffer> command_buffer_object =
       NPCreateObject<StrictMock<MockCommandBuffer> >(NULL);
   EXPECT_CALL(mock_browser_, CreateObject(NULL,
-      BaseNPObject::GetNPClass<CommandBuffer>()))
+      NPGetClass<CommandBuffer>()))
     .WillOnce(Return(command_buffer_object.ToReturned()));
 
   EXPECT_CALL(*command_buffer_object.Get(), Initialize(1024))
     .WillOnce(Return(false));
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_object_->New("application/foo",
                                                 0,
                                                 NULL,
                                                 NULL,
                                                 NULL));
 
   EXPECT_EQ(NPObjectPointer<NPObject>(), plugin_object_->OpenCommandBuffer());
 
   EXPECT_EQ(NPERR_NO_ERROR, plugin_object_->Destroy(NULL));
 }
 }  // namespace gpu_plugin
 }  // namespace o3d