Make context groups share a TextureBufferManager

gpu/command_buffer/client/cmd_buffer_helper_test.cc

 // Copyright (c) 2012 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.
 
 // Tests for the Command Buffer Helper.
 
 #include "base/bind.h"
 #include "base/bind_helpers.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/transfer_buffer_manager.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 namespace gpu {
 
 using testing::Return;
@@ skipping 35 matching lines @@
     GpuScheduler* gpu_scheduler_;
   };
 
   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, _, _))
         .WillRepeatedly(Return(error::kNoError));
 
-    command_buffer_.reset(new CommandBufferService);
-    command_buffer_->Initialize();
+    {

[apatrick_chromium, 2012/05/31 23:57:33]

Why is this in a block?

[greggman, 2012/06/01 00:01:45]

just to make sure the variable "manager" isn't used again

+      TransferBufferManager* manager = new TransferBufferManager();
+      transfer_buffer_manager_.reset(manager);
+      EXPECT_TRUE(manager->Initialize());
+    }
+    command_buffer_.reset(
+        new CommandBufferService(transfer_buffer_manager_.get()));
+    EXPECT_TRUE(command_buffer_->Initialize());
 
     gpu_scheduler_.reset(new GpuScheduler(
         command_buffer_.get(), api_mock_.get(), NULL));
     command_buffer_->SetPutOffsetChangeCallback(base::Bind(
         &GpuScheduler::PutChanged, base::Unretained(gpu_scheduler_.get())));
     command_buffer_->SetGetBufferChangeCallback(base::Bind(
         &GpuScheduler::SetGetBuffer, base::Unretained(gpu_scheduler_.get())));
 
     do_jump_command_.reset(new DoJumpCommand(gpu_scheduler_.get()));
     EXPECT_CALL(*api_mock_, DoCommand(cmd::kJump, _, _))
@@ skipping 73 matching lines @@
     return command_buffer_->GetState().error;
   }
 
   CommandBufferOffset get_helper_put() { return helper_->put_; }
 
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool_;
 #endif
   MessageLoop message_loop_;
   scoped_ptr<AsyncAPIMock> api_mock_;
+  scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
   scoped_ptr<CommandBufferService> command_buffer_;
   scoped_ptr<GpuScheduler> gpu_scheduler_;
   scoped_ptr<CommandBufferHelper> helper_;
   Sequence sequence_;
   scoped_ptr<DoJumpCommand> do_jump_command_;
 };
 
 // Checks that commands in the buffer are properly executed, and that the
 // status/error stay valid.
 TEST_F(CommandBufferHelperTest, TestCommandProcessing) {
@@ skipping 165 matching lines @@
 TEST_F(CommandBufferHelperTest, Noop) {
   for (int ii = 1; ii < 4; ++ii) {
     CommandBufferOffset put_before = get_helper_put();
     helper_->Noop(ii);
     CommandBufferOffset put_after = get_helper_put();
     EXPECT_EQ(ii, put_after - put_before);
   }
 }
 
 }  // namespace gpu