Revert of Optimize GLES2DecoderImpl::ApplyDirtyState.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_3.cc

 // Copyright (c) 2011 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.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include "gpu/command_buffer/common/gles2_cmd_format.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
@@ skipping 16 matching lines @@
 namespace gpu {
 namespace gles2 {
 
 using namespace cmds;
 
 class GLES2DecoderTest3 : public GLES2DecoderTestBase {
  public:
   GLES2DecoderTest3() { }
 };
 
-INSTANTIATE_TEST_CASE_P(Service, GLES2DecoderTest3, ::testing::Bool());
-
-TEST_P(GLES2DecoderTest3, TraceBeginCHROMIUM) {
+TEST_F(GLES2DecoderTest3, TraceBeginCHROMIUM) {
   const uint32 kBucketId = 123;
   const char kName[] = "test_command";
   SetBucketAsCString(kBucketId, kName);
 
   TraceBeginCHROMIUM begin_cmd;
   begin_cmd.Init(kBucketId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd));
 }
 
-TEST_P(GLES2DecoderTest3, TraceEndCHROMIUM) {
+TEST_F(GLES2DecoderTest3, TraceEndCHROMIUM) {
   // Test end fails if no begin.
   TraceEndCHROMIUM end_cmd;
   end_cmd.Init();
   EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd));
   EXPECT_EQ(GL_INVALID_OPERATION, GetGLError());
 
   const uint32 kBucketId = 123;
   const char kName[] = "test_command";
   SetBucketAsCString(kBucketId, kName);
 
   TraceBeginCHROMIUM begin_cmd;
   begin_cmd.Init(kBucketId);
   EXPECT_EQ(error::kNoError, ExecuteCmd(begin_cmd));
 
   end_cmd.Init();
   EXPECT_EQ(error::kNoError, ExecuteCmd(end_cmd));
   EXPECT_EQ(GL_NO_ERROR, GetGLError());
 }
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_3_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu