Added GL_CHROMIUM_trace_marker feature as well as gpu_toplevel markers.

gpu/command_buffer/service/feature_info_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.
 
 #include "gpu/command_buffer/service/feature_info.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 216 matching lines @@
   }
 }
 
 TEST_F(FeatureInfoTest, InitializeNoExtensions) {
   SetupInitExpectations("");
   // Check default extensions are there
   EXPECT_THAT(info_->extensions(), HasSubstr("GL_CHROMIUM_resource_safe"));
   EXPECT_THAT(info_->extensions(), HasSubstr("GL_CHROMIUM_strict_attribs"));
   EXPECT_THAT(info_->extensions(),
               HasSubstr("GL_ANGLE_translated_shader_source"));
+  EXPECT_THAT(info_->extensions(), HasSubstr("GL_CHROMIUM_trace_marker"));
 
   // Check a couple of random extensions that should not be there.
   EXPECT_THAT(info_->extensions(), Not(HasSubstr("GL_OES_texture_npot")));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_EXT_texture_compression_dxt1")));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_CHROMIUM_texture_compression_dxt3")));
   EXPECT_THAT(info_->extensions(),
               Not(HasSubstr("GL_CHROMIUM_texture_compression_dxt5")));
   EXPECT_THAT(info_->extensions(),
@@ skipping 1222 matching lines @@
   EXPECT_FALSE(
       info_->GetTextureFormatValidator(GL_RG_EXT).IsValid(GL_HALF_FLOAT_OES));
   EXPECT_TRUE(
       info_->GetTextureFormatValidator(GL_RED_EXT).IsValid(GL_UNSIGNED_BYTE));
   EXPECT_TRUE(
       info_->GetTextureFormatValidator(GL_RG_EXT).IsValid(GL_UNSIGNED_BYTE));
 }
 
 }  // namespace gles2
 }  // namespace gpu