Implemented shared memory as an NPObject.

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/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 "o3d/gpu_plugin/system_services/shared_memory_mock.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 {
@@ skipping 29 matching lines @@
   }
 
   MockNPBrowser mock_browser_;
   NPObjectPointer<CommandBuffer> command_buffer_object_;
   NPObjectPointer<DynamicNPObject> window_object_;
   NPObjectPointer<DynamicNPObject> chromium_object_;
   NPObjectPointer<MockSystemNPObject> system_object_;
 };
 
 TEST_F(CommandBufferTest, TestBehaviorWhileUninitialized) {
-  EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
+  EXPECT_EQ(NPObjectPointer<NPObject>(),
+            command_buffer_object_->GetSharedMemory());
   EXPECT_EQ(0, command_buffer_object_->GetGetOffset());
 }
 
 TEST_F(CommandBufferTest, InitializesCommandBuffer) {
   EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
     .WillOnce(Return(window_object_.ToReturned()));
 
-  NPObjectPointer<NPObject> expected_buffer =
-      NPCreateObject<MockNPObject>(NULL);
+  NPObjectPointer<MockSharedMemory> expected_shared_memory =
+      NPCreateObject<StrictMock<MockSharedMemory> >(NULL);
 
   EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
-    .WillOnce(Return(expected_buffer));
+    .WillOnce(Return(expected_shared_memory));
 
-  NPSharedMemory shared_memory;
-
-  EXPECT_CALL(mock_browser_, MapSharedMemory(NULL,
-                                             expected_buffer.Get(),
-                                             1024,
-                                             false))
-    .WillOnce(Return(&shared_memory));
+  EXPECT_CALL(*expected_shared_memory.Get(), Map())
+    .WillOnce(Return(true));
 
   EXPECT_TRUE(command_buffer_object_->Initialize(1024));
-  EXPECT_EQ(expected_buffer, command_buffer_object_->GetBuffer());
+  EXPECT_EQ(expected_shared_memory, command_buffer_object_->GetSharedMemory());
 
   // Cannot reinitialize.
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
-  EXPECT_EQ(expected_buffer, command_buffer_object_->GetBuffer());
+  EXPECT_EQ(expected_shared_memory, command_buffer_object_->GetSharedMemory());
 }
 
 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<NPObject>()));
 
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
-  EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
+  EXPECT_EQ(NPObjectPointer<NPObject>(),
+            command_buffer_object_->GetSharedMemory());
 }
 
 TEST_F(CommandBufferTest, InitializeFailsIfCannotMapSharedMemory) {
   EXPECT_CALL(mock_browser_, GetWindowNPObject(NULL))
     .WillOnce(Return(window_object_.ToReturned()));
 
-  NPObjectPointer<NPObject> expected_buffer =
-      NPCreateObject<MockNPObject>(NULL);
+  NPObjectPointer<MockSharedMemory> expected_shared_memory =
+      NPCreateObject<StrictMock<MockSharedMemory> >(NULL);
 
   EXPECT_CALL(*system_object_.Get(), CreateSharedMemory(1024))
-    .WillOnce(Return(expected_buffer));
+    .WillOnce(Return(expected_shared_memory));
 
-  EXPECT_CALL(mock_browser_, MapSharedMemory(NULL,
-                                             expected_buffer.Get(),
-                                             1024,
-                                             false))
-    .WillOnce(Return(static_cast<NPSharedMemory*>(NULL)));
+  EXPECT_CALL(*expected_shared_memory.Get(), Map())
+    .WillOnce(Return(false));
 
   EXPECT_FALSE(command_buffer_object_->Initialize(1024));
-  EXPECT_EQ(NPObjectPointer<NPObject>(), command_buffer_object_->GetBuffer());
+  EXPECT_EQ(NPObjectPointer<NPObject>(),
+            command_buffer_object_->GetSharedMemory());
 }
 }  // namespace gpu_plugin
 }  // namespace o3d