Index: gpu/command_buffer/client/cmd_buffer_helper_test.cc |
=================================================================== |
--- gpu/command_buffer/client/cmd_buffer_helper_test.cc (revision 33880) |
+++ gpu/command_buffer/client/cmd_buffer_helper_test.cc (working copy) |
@@ -38,16 +38,12 @@ |
#include "gpu/command_buffer/service/mocks.h" |
#include "gpu/command_buffer/service/command_buffer_service.h" |
#include "gpu/command_buffer/service/gpu_processor.h" |
-#include "gpu/np_utils/np_object_pointer.h" |
-#include "gpu/np_utils/np_browser_stub.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace command_buffer { |
using command_buffer::CommandBufferService; |
using command_buffer::GPUProcessor; |
-using np_utils::NPCreateObject; |
-using np_utils::NPObjectPointer; |
using testing::Return; |
using testing::Mock; |
using testing::Truly; |
@@ -71,7 +67,7 @@ |
EXPECT_CALL(*api_mock_, DoCommand(0, 0, _)) |
.WillRepeatedly(Return(parse_error::kParseNoError)); |
- ::base::SharedMemory* ring_buffer = new ::base::SharedMemory; |
+ base::SharedMemory* ring_buffer = new base::SharedMemory; |
ring_buffer->Create(std::wstring(), false, false, kCommandBufferSizeBytes); |
ring_buffer->Map(1024); |
@@ -142,7 +138,6 @@ |
base::AtExitManager at_exit_manager_; |
MessageLoop message_loop_; |
- np_utils::StubNPBrowser browser_; |
scoped_ptr<AsyncAPIMock> api_mock_; |
scoped_ptr<CommandBufferService> command_buffer_; |
command_buffer::CommandParser* parser_; |