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

gpu/command_buffer/service/gpu_processor_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 "base/at_exit.h"
 #include "base/message_loop.h"
 #include "gpu/command_buffer/common/command_buffer_mock.h"
 #include "gpu/command_buffer/service/mocks.h"
 #include "gpu/command_buffer/service/gpu_processor.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "gpu/np_utils/np_browser_mock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Invoke;
 using testing::NiceMock;
 using testing::Return;
 using testing::SetArgumentPointee;
 using testing::StrictMock;
 
 namespace command_buffer {
 
 const size_t kRingBufferSize = 1024;
 const size_t kRingBufferEntries = kRingBufferSize / sizeof(int32);
 
 class GPUProcessorTest : public testing::Test {
  protected:
   virtual void SetUp() {
     shared_memory_.reset(new ::base::SharedMemory);
     shared_memory_->Create(std::wstring(), false, false, kRingBufferSize);
     shared_memory_->Map(kRingBufferSize);
     buffer_ = static_cast<int32*>(shared_memory_->memory());
 
     memset(buffer_, 0, kRingBufferSize);
 
-    // Don't mock PluginThreadAsyncCall. Have it schedule the task.
-    ON_CALL(mock_browser_, PluginThreadAsyncCall(_, _, _))
-      .WillByDefault(
-          Invoke(&mock_browser_,
-                 &np_utils::MockNPBrowser::ConcretePluginThreadAsyncCall));
-
     command_buffer_.reset(new MockCommandBuffer);
     ON_CALL(*command_buffer_.get(), GetRingBuffer())
       .WillByDefault(Return(shared_memory_.get()));
     ON_CALL(*command_buffer_.get(), GetSize())
       .WillByDefault(Return(kRingBufferEntries));
 
     async_api_.reset(new StrictMock<command_buffer::AsyncAPIMock>);
 
     decoder_ = gles2::GLES2Decoder::Create();
 
@@ skipping 11 matching lines @@
   }
 
   virtual void TearDown() {
     // Ensure that any unexpected tasks posted by the GPU processor are executed
     // in order to fail the test.
     MessageLoop::current()->RunAllPending();
   }
 
   base::AtExitManager at_exit_manager;
   MessageLoop message_loop;
-  np_utils::MockNPBrowser mock_browser_;
   scoped_ptr<MockCommandBuffer> command_buffer_;
   scoped_ptr<::base::SharedMemory> shared_memory_;
   int32* buffer_;
   command_buffer::gles2::GLES2Decoder* decoder_;
   command_buffer::CommandParser* parser_;
   scoped_ptr<command_buffer::AsyncAPIMock> async_api_;
   scoped_refptr<GPUProcessor> processor_;
 };
 
 TEST_F(GPUProcessorTest, ProcessorDoesNothingIfRingBufferIsEmpty) {
@@ skipping 190 matching lines @@
 
   EXPECT_EQ(kRingBufferSize, processor_->GetSharedMemorySize(7));
 }
 
 TEST_F(GPUProcessorTest, SetTokenForwardsToCommandBuffer) {
   EXPECT_CALL(*command_buffer_, SetToken(7));
   processor_->set_token(7);
 }
 
 }  // namespace command_buffer