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

gpu/command_buffer/client/fenced_allocator_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 22 matching lines @@
 // This file contains the tests for the FencedAllocator class.
 
 #include "base/at_exit.h"
 #include "base/message_loop.h"
 #include "gpu/command_buffer/client/cmd_buffer_helper.h"
 #include "gpu/command_buffer/client/fenced_allocator.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.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_browser_stub.h"
-#include "gpu/np_utils/np_object_pointer.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::_;
 
 class BaseFencedAllocatorTest : public testing::Test {
  protected:
   static const unsigned int kBufferSize = 1024;
 
   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(cmd::kNoop, 0, _))
         .WillRepeatedly(Return(parse_error::kParseNoError));
     // Forward the SetToken calls to the engine
     EXPECT_CALL(*api_mock_.get(), DoCommand(cmd::kSetToken, 1, _))
         .WillRepeatedly(DoAll(Invoke(api_mock_.get(), &AsyncAPIMock::SetToken),
                               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, 1024);
     ring_buffer->Map(1024);
 
     command_buffer_.reset(new CommandBufferService);
     command_buffer_->Initialize(ring_buffer);
 
     parser_ = new command_buffer::CommandParser(ring_buffer->memory(),
                                                 kBufferSize,
                                                 0,
                                                 kBufferSize,
@@ skipping 10 matching lines @@
     helper_.reset(new CommandBufferHelper(command_buffer_.get()));
     helper_->Initialize();
   }
 
   virtual void TearDown() {
     helper_.release();
   }
 
   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_;
 };
 
 #ifndef COMPILER_MSVC
 const unsigned int BaseFencedAllocatorTest::kBufferSize;
 #endif
 
@@ skipping 374 matching lines @@
   EXPECT_LE(token, command_buffer_->GetToken());
 
   // Free up everything.
   for (unsigned int i = 0; i < kAllocCount; ++i) {
     allocator_->Free(pointers[i]);
     EXPECT_TRUE(allocator_->CheckConsistency());
   }
 }
 
 }  // namespace command_buffer