WebGraphicsContext3DCommandBufferImpl cleanup, Canvas2D thottling fix, GpuScheduler fix.

gpu/command_buffer/service/gpu_scheduler_unittest.cc

Index: gpu/command_buffer/service/gpu_scheduler_unittest.cc
diff --git a/gpu/command_buffer/service/gpu_scheduler_unittest.cc b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
index 965353c43c5c0ea55d80b01542d2146624f67726..ccb34026efe4b277732adb11d118c9289f406221 100644
--- a/gpu/command_buffer/service/gpu_scheduler_unittest.cc
+++ b/gpu/command_buffer/service/gpu_scheduler_unittest.cc
@@ -44,7 +44,7 @@ class GpuSchedulerTest : public testing::Test {
     ON_CALL(*command_buffer_.get(), GetState())
       .WillByDefault(Return(default_state));
 
-    async_api_.reset(new StrictMock<AsyncAPIMock>);
+    async_api_.reset(new StrictMock<SpecializedAsyncAPIMock>);

[jamesr, 2011/06/03 19:09:32]

what's so special about this mock?  in what way is it more specialized than any
other mock?

[jbates, 2011/06/03 21:27:32]

Isn't that similar to asking in what way is the AsyncAPI class Async? You have
to look at its definition to find out in both cases :P It is a specialized
subclass of the mock: it overrides the method that the mock provides and
specializes it. Anyway, I made the class name longer since this tripped up both
reviewers.

 
     decoder_ = new gles2::MockGLES2Decoder();
 
@@ -161,11 +161,12 @@ TEST_F(GpuSchedulerTest, SchedulerSetsTheGLContext) {
 }
 
 TEST_F(GpuSchedulerTest, PostsTaskToFinishRemainingCommands) {
+  unsigned int pauseCmd = SpecializedAsyncAPIMock::kTestPauseCommand;
   CommandHeader* header = reinterpret_cast<CommandHeader*>(&buffer_[0]);
   header[0].command = 7;
   header[0].size = 2;
   buffer_[1] = 123;
-  header[2].command = 8;
+  header[2].command = pauseCmd;
   header[2].size = 1;
   header[3].command = 9;
   header[3].size = 1;
@@ -180,7 +181,7 @@ TEST_F(GpuSchedulerTest, PostsTaskToFinishRemainingCommands) {
     .WillOnce(Return(error::kNoError));
   EXPECT_CALL(*command_buffer_, SetGetOffset(2));
 
-  EXPECT_CALL(*async_api_, DoCommand(8, 0, &buffer_[2]))
+  EXPECT_CALL(*async_api_, DoCommand(pauseCmd, 0, &buffer_[2]))
     .WillOnce(Return(error::kNoError));
   EXPECT_CALL(*command_buffer_, SetGetOffset(3));