GPU context creation code duplication cleanup

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 <limits>
 
@@ skipping 375 matching lines @@
   static const GLuint kQueriesStartId = 1;
   static const GLuint kVertexArraysStartId = 1;
 
   typedef MockTransferBuffer::ExpectedMemoryInfo ExpectedMemoryInfo;
 
   class TestContext {
    public:
     TestContext() : commands_(NULL), token_(0) {}
 
     bool Initialize(ShareGroup* share_group,
-                    bool bind_generates_resource,
+                    bool bind_generates_resource_client,
+                    bool bind_generates_resource_service,
                     bool lose_context_when_out_of_memory) {
       command_buffer_.reset(new StrictMock<MockClientCommandBuffer>());
       if (!command_buffer_->Initialize())
         return false;
 
       transfer_buffer_.reset(
           new MockTransferBuffer(command_buffer_.get(),
                                  kTransferBufferSize,
                                  GLES2Implementation::kStartingOffset,
                                  GLES2Implementation::kAlignment));
@@ skipping 14 matching lines @@
       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;
       int_state.max_vertex_texture_image_units = kMaxVertexTextureImageUnits;
       int_state.max_vertex_uniform_vectors = kMaxVertexUniformVectors;
       int_state.num_compressed_texture_formats = kNumCompressedTextureFormats;
       int_state.num_shader_binary_formats = kNumShaderBinaryFormats;
       int_state.bind_generates_resource_chromium =
-          bind_generates_resource ? 1 : 0;
+          bind_generates_resource_service ? 1 : 0;
 
       // This just happens to work for now because IntState has 1 GLint per
       // state.
       // If IntState gets more complicated this code will need to get more
       // complicated.
       ExpectedMemoryInfo mem1 = transfer_buffer_->GetExpectedMemory(
           sizeof(GLES2Implementation::GLStaticState::IntState) * 2 +
           sizeof(cmds::GetShaderPrecisionFormat::Result) * 12);
 
       {
         InSequence sequence;
 
         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(),
                                           share_group,
                                           transfer_buffer_.get(),
-                                          bind_generates_resource,
+                                          bind_generates_resource_client,
                                           lose_context_when_out_of_memory,
                                           gpu_control_.get()));
 
         if (!gl_->Initialize(kTransferBufferSize,
                              kTransferBufferSize,
                              kTransferBufferSize,
                              GLES2Implementation::kNoLimit))
           return false;
       }
 
@@ skipping 67 matching lines @@
           bind_generates_resource_service(true),
           lose_context_when_out_of_memory(false) {}
 
     bool bind_generates_resource_client;
     bool bind_generates_resource_service;
     bool lose_context_when_out_of_memory;
   };
 
   bool Initialize(const ContextInitOptions& init_options) {
     bool success = true;
-    share_group_ = new ShareGroup(init_options.bind_generates_resource_service);
+    share_group_ = new ShareGroup(init_options.bind_generates_resource_client);
 
     for (int i = 0; i < kNumTestContexts; i++) {
       if (!test_contexts_[i].Initialize(
               share_group_.get(),
               init_options.bind_generates_resource_client,
+              init_options.bind_generates_resource_service,
               init_options.lose_context_when_out_of_memory))
         success = false;
     }
 
     // Default to test context 0.
     gpu_control_ = test_contexts_[0].gpu_control_.get();
     helper_ = test_contexts_[0].helper_.get();
     transfer_buffer_ = test_contexts_[0].transfer_buffer_.get();
     gl_ = test_contexts_[0].gl_.get();
     commands_ = test_contexts_[0].commands_;
@@ skipping 2847 matching lines @@
   ContextInitOptions init_options;
   init_options.bind_generates_resource_client = true;
   init_options.bind_generates_resource_service = false;
   EXPECT_FALSE(Initialize(init_options));
 }
 
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu