gpu: Refactor GpuMemoryBuffer framework for multi-process support.

gpu/command_buffer/client/gles2_implementation_unittest.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 GLES2Implementation.
 
 #include "gpu/command_buffer/client/gles2_implementation.h"
 
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
@@ skipping 348 matching lines @@
 
     transfer_buffer_.reset(new MockTransferBuffer(
         command_buffer(),
         kTransferBufferSize,
         GLES2Implementation::kStartingOffset,
         GLES2Implementation::kAlignment));
 
     helper_.reset(new GLES2CmdHelper(command_buffer()));
     helper_->Initialize(kCommandBufferSizeBytes);
 
+    gpu_control_.reset(new StrictMock<MockClientGpuControl>());
+
     GLES2Implementation::GLStaticState state;
     GLES2Implementation::GLStaticState::IntState& int_state = state.int_state;
     int_state.max_combined_texture_image_units = kMaxCombinedTextureImageUnits;
     int_state.max_cube_map_texture_size = kMaxCubeMapTextureSize;
     int_state.max_fragment_uniform_vectors = kMaxFragmentUniformVectors;
     int_state.max_renderbuffer_size = kMaxRenderbufferSize;
     int_state.max_texture_image_units = kMaxTextureImageUnits;
     int_state.max_texture_size = kMaxTextureSize;
     int_state.max_varying_vectors = kMaxVaryingVectors;
     int_state.max_vertex_attribs = kMaxVertexAttribs;
@@ skipping 15 matching lines @@
       EXPECT_CALL(*command_buffer(), OnFlush())
           .WillOnce(SetMemory(mem1.ptr + sizeof(int_state), int_state))
           .RetiresOnSaturation();
       GetNextToken();  // eat the token that starting up will use.
 
       gl_.reset(new GLES2Implementation(
           helper_.get(),
           NULL,
           transfer_buffer_.get(),
           bind_generates_resource,
-          NULL));
+          gpu_control_.get()));
       ASSERT_TRUE(gl_->Initialize(
           kTransferBufferSize,
           kTransferBufferSize,
           kTransferBufferSize));
     }
 
     EXPECT_CALL(*command_buffer(), OnFlush())
         .Times(1)
         .RetiresOnSaturation();
     helper_->CommandBufferHelper::Finish();
@@ skipping 51 matching lines @@
         .RetiresOnSaturation();
     return gl_->GetError();
   }
 
   bool GetBucketContents(uint32 bucket_id, std::vector<int8>* data) {
     return gl_->GetBucketContents(bucket_id, data);
   }
 
   Sequence sequence_;
   scoped_ptr<MockClientCommandBuffer> command_buffer_;
+  scoped_ptr<MockClientGpuControl> gpu_control_;
   scoped_ptr<GLES2CmdHelper> helper_;
   scoped_ptr<MockTransferBuffer> transfer_buffer_;
   scoped_ptr<GLES2Implementation> gl_;
   CommandBufferEntry* commands_;
   int token_;
 };
 
 void GLES2ImplementationTest::SetUp() {
   Initialize(true);
 }
@@ skipping 1983 matching lines @@
 TEST_F(GLES2ImplementationTest, GetString) {
   const uint32 kBucketId = GLES2Implementation::kResultBucketId;
   const Str7 kString = {"foobar"};
   // GL_CHROMIUM_map_sub GL_CHROMIUM_flipy are hard coded into
   // GLES2Implementation.
   const char* expected_str =
       "foobar "
       "GL_CHROMIUM_flipy "
       "GL_CHROMIUM_map_sub "
       "GL_CHROMIUM_shallow_flush "
-      "GL_EXT_unpack_subimage";
+      "GL_EXT_unpack_subimage "
+      "GL_CHROMIUM_map_image";
   const char kBad = 0x12;
   struct Cmds {
     cmd::SetBucketSize set_bucket_size1;
     cmds::GetString get_string;
     cmd::GetBucketStart get_bucket_start;
     cmd::SetToken set_token1;
     cmd::SetBucketSize set_bucket_size2;
   };
   ExpectedMemoryInfo mem1 = GetExpectedMemory(MaxTransferBufferSize());
   ExpectedMemoryInfo result1 =
@@ skipping 377 matching lines @@
   ClearCommands();
   gl_->Enable(GL_BLEND);
   EXPECT_TRUE(NoCommandsWritten());
 }
 
 
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu