Replaced BaseNPObject with DefaultNPObject because......

o3d/gpu_plugin/command_buffer_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.h"
-#include "o3d/gpu_plugin/np_utils/base_np_object_mock.h"
 #include "o3d/gpu_plugin/np_utils/dynamic_np_object.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"
 
 using testing::_;
 using testing::DoAll;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 
 namespace o3d {
 namespace gpu_plugin {
 
-class MockSystemNPObject : public DispatchedNPObject {
+class MockSystemNPObject : public DefaultNPObject<NPObject> {
  public:
-  explicit MockSystemNPObject(NPP npp) : DispatchedNPObject(npp) {
+  explicit MockSystemNPObject(NPP npp) {
   }
 
   MOCK_METHOD1(CreateSharedMemory, NPObjectPointer<NPObject>(int32));
 
- protected:
-  NP_UTILS_BEGIN_DISPATCHER_CHAIN(MockSystemNPObject, DispatchedNPObject)
+  NP_UTILS_BEGIN_DISPATCHER_CHAIN(MockSystemNPObject, DefaultNPObject<NPObject>)
     NP_UTILS_DISPATCHER(CreateSharedMemory, NPObjectPointer<NPObject>(int32))
   NP_UTILS_END_DISPATCHER_CHAIN
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockSystemNPObject);
 };
 
 class CommandBufferTest : public testing::Test {
  protected:
   virtual void SetUp() {
@@ skipping 17 matching lines @@
 
 TEST_F(CommandBufferTest, TestBehaviorWhileUninitialized) {
   EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
   EXPECT_EQ(0, command_buffer_object_->GetGetOffset());
 }
 
 TEST_F(CommandBufferTest, InitializesCommandBuffer) {
   EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
     .WillOnce(Return(window_object_.ToReturned()));
 
-  NPObjectPointer<BaseNPObject> expected_buffer =
-      NPCreateObject<BaseNPObject>(NULL);
+  NPObjectPointer<NPObject> expected_buffer =
+      NPCreateObject<MockNPObject>(NULL);
 
   EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
     .WillOnce(Return(expected_buffer));
 
   NPSharedMemory shared_memory;
 
   EXPECT_CALL(mock_browser_, MapSharedMemory(NULL,
                                              expected_buffer.Get(),
                                              1024,
                                              false))
     .WillOnce(Return(&shared_memory));
 
   EXPECT_TRUE(command_buffer_object_->Initialize(1024));
   EXPECT_EQ(expected_buffer, command_buffer_object_->GetBuffer());
 
   // Cannot reinitialize.
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
   EXPECT_EQ(expected_buffer, command_buffer_object_->GetBuffer());
 }
 
 TEST_F(CommandBufferTest, InitializeFailsIfCannotCreateSharedMemory) {
   EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
     .WillOnce(Return(window_object_.ToReturned()));
 
   EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
-    .WillOnce(Return(NPObjectPointer<BaseNPObject>()));
+    .WillOnce(Return(NPObjectPointer<NPObject>()));
 
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
   EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
 }
 
 TEST_F(CommandBufferTest, InitializeFailsIfCannotMapSharedMemory) {
   EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
     .WillOnce(Return(window_object_.ToReturned()));
 
-  NPObjectPointer<BaseNPObject> expected_buffer =
-      NPCreateObject<BaseNPObject>(NULL);
+  NPObjectPointer<NPObject> expected_buffer =
+      NPCreateObject<MockNPObject>(NULL);
 
   EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
     .WillOnce(Return(expected_buffer));
 
   EXPECT_CALL(mock_browser_, MapSharedMemory(NULL,
                                              expected_buffer.Get(),
                                              1024,
                                              false))
     .WillOnce(Return(static_cast<NPSharedMemory*>(NULL)));
 
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
   EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
 }
 }  // namespace gpu_plugin
 }  // namespace o3d