Take GL version and extensions correctly into account when binding functions

gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
index 910cb0104b214ec80de4dd7872f5a70f1904a145..ca1b1dd76d58c39d7fb1d193e652e5190246f3fd 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
@@ -4739,7 +4739,7 @@ TEST_F(GLES2DecoderManualInitTest,
       .WillOnce(Return(GL_NO_ERROR))
       .WillOnce(Return(GL_OUT_OF_MEMORY))
       .RetiresOnSaturation();
-  EXPECT_CALL(*gl_, RenderbufferStorageMultisampleEXT(
+  EXPECT_CALL(*gl_, RenderbufferStorageMultisample(
       GL_RENDERBUFFER, 1, GL_RGBA, 100, 50))
       .Times(1)
       .RetiresOnSaturation();
@@ -4762,7 +4762,7 @@ TEST_F(GLES2DecoderManualInitTest,
       true);   // bind generates resource
   DoBindRenderbuffer(GL_RENDERBUFFER, client_renderbuffer_id_,
                     kServiceRenderbufferId);
-  EXPECT_CALL(*gl_, RenderbufferStorageMultisampleEXT(_, _, _, _, _))
+  EXPECT_CALL(*gl_, RenderbufferStorageMultisample(_, _, _, _, _))
       .Times(0)
       .RetiresOnSaturation();
   RenderbufferStorageMultisampleCHROMIUM cmd;
@@ -4798,11 +4798,11 @@ TEST_F(GLES2DecoderManualInitTest, RenderbufferStorageMultisampleCHROMIUM) {
       .RetiresOnSaturation();
   EXPECT_CALL(
       *gl_,
-      RenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
-                                        TestHelper::kMaxSamples,
-                                        GL_RGBA,
-                                        TestHelper::kMaxRenderbufferSize,
-                                        1))
+      RenderbufferStorageMultisample(GL_RENDERBUFFER,
+                                     TestHelper::kMaxSamples,
+                                     GL_RGBA,
+                                     TestHelper::kMaxRenderbufferSize,
+                                     1))
       .Times(1)
       .RetiresOnSaturation();
   EXPECT_CALL(*gl_, GetError())
@@ -4872,11 +4872,11 @@ TEST_P(GLES2DecoderMultisampledRenderToTextureTest,
   } else {
     EXPECT_CALL(
         *gl_,
-        RenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
-                                          TestHelper::kMaxSamples,
-                                          GL_RGBA,
-                                          TestHelper::kMaxRenderbufferSize,
-                                          1))
+        RenderbufferStorageMultisample(GL_RENDERBUFFER,
+                                       TestHelper::kMaxSamples,
+                                       GL_RGBA,
+                                       TestHelper::kMaxRenderbufferSize,
+                                       1))
         .Times(1)
         .RetiresOnSaturation();
   }