Removed command buffer's last dependency on NPAPI....

gpu/command_buffer/client/cmd_buffer_helper_test.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 
 
 // Tests for the Command Buffer Helper.
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
 #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;
 using testing::Sequence;
 using testing::DoAll;
 using testing::Invoke;
 using testing::_;
 
 const int32 kNumCommandEntries = 10;
 const int32 kCommandBufferSizeBytes = kNumCommandEntries * sizeof(int32);
 
 // Test fixture for CommandBufferHelper test - Creates a CommandBufferHelper,
 // using a CommandBufferEngine with a mock AsyncAPIInterface for its interface
 // (calling it directly, not through the RPC mechanism).
 class CommandBufferHelperTest : public testing::Test {
  protected:
   virtual void SetUp() {
     api_mock_.reset(new AsyncAPIMock);
     // ignore noops in the mock - we don't want to inspect the internals of the
     // helper.
     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);
 
     command_buffer_.reset(new CommandBufferService);
     command_buffer_->Initialize(ring_buffer);
 
     parser_ = new command_buffer::CommandParser(ring_buffer->memory(),
                                                 kCommandBufferSizeBytes,
                                                 0,
                                                 kCommandBufferSizeBytes,
@@ skipping 50 matching lines @@
         // we're on the bottom side, check we are below get.
         EXPECT_GT(parser_get, limit);
       }
     }
   }
 
   CommandBufferOffset get_helper_put() { return helper_->put_; }
 
   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_;
   scoped_ptr<CommandBufferHelper> helper_;
   Sequence sequence_;
 };
 
 // Checks that commands in the buffer are properly executed, and that the
 // status/error stay valid.
 TEST_F(CommandBufferHelperTest, TestCommandProcessing) {
@@ skipping 138 matching lines @@
 
   // Check that the commands did happen.
   Mock::VerifyAndClearExpectations(api_mock_.get());
 
   // Check the error status.
   EXPECT_FALSE(command_buffer_->GetErrorStatus());
   EXPECT_EQ(parse_error::kParseNoError, command_buffer_->ResetParseError());
 }
 
 }  // namespace command_buffer