gpu: Remove map_image field from gpu::Capabilities.

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 386 matching lines @@
       transfer_buffer_.reset(
           new MockTransferBuffer(command_buffer_.get(),
                                  kTransferBufferSize,
                                  GLES2Implementation::kStartingOffset,
                                  GLES2Implementation::kAlignment));
 
       helper_.reset(new GLES2CmdHelper(command_buffer()));
       helper_->Initialize(kCommandBufferSizeBytes);
 
       gpu_control_.reset(new StrictMock<MockClientGpuControl>());
-      EXPECT_CALL(*gpu_control_, GetCapabilities())
-          .WillOnce(testing::Return(Capabilities()));
 
       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;
@@ skipping 18 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(),
                                     share_group,
                                     transfer_buffer_.get(),
                                     bind_generates_resource,
-                                    gpu_control_.get()));
+                                    gpu_control_.get(),
+                                    Capabilities()));
         ASSERT_TRUE(gl_->Initialize(kTransferBufferSize,
                                     kTransferBufferSize,
                                     kTransferBufferSize,
                                     GLES2Implementation::kNoLimit));
       }
 
       EXPECT_CALL(*command_buffer_, OnFlush()).Times(1).RetiresOnSaturation();
       helper_->CommandBufferHelper::Finish();
       ::testing::Mock::VerifyAndClearExpectations(gl_.get());
 
@@ skipping 2216 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_image "
       "GL_EXT_unpack_subimage";
   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());
@@ skipping 403 matching lines @@
   Cmds expected;
   expected.cmd.Init(GL_TEXTURE_2D, mailbox.name);
   gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
   EXPECT_EQ(0, memcmp(&expected, commands_, sizeof(expected)));
 }
 
 #include "gpu/command_buffer/client/gles2_implementation_unittest_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu