FeatureInfo: Remove allowed_extensions and init workarounds early

gpu/command_buffer/service/feature_info.h

 // 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
 #define GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
 
 #include <set>
 #include <string>
 #include "base/containers/hash_tables.h"
@@ skipping 46 matching lines @@
 
 #define GPU_OP(type, name) bool name;
     GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
 #undef GPU_OP
 
     // Note: 0 here means use driver limit.
     GLint max_texture_size;
     GLint max_cube_map_texture_size;
   };
 
+  // Constructor with workarounds taken from the current process's CommandLine
   FeatureInfo();
 
-  // If allowed features = NULL or "*", all features are allowed. Otherwise
-  // only features that match the strings in allowed_features are allowed.
-  bool Initialize(const char* allowed_features);
-  bool Initialize(const DisallowedFeatures& disallowed_features,
-                  const char* allowed_features);
+  // Constructor with workarounds taken from |command_line|
+  FeatureInfo(const CommandLine& command_line);
 
-  // Turns on certain features if they can be turned on.
-  void AddFeatures(const CommandLine& command_line);
+  // Initializes the feature information. Needs a current GL context.
+  bool Initialize();
+  bool Initialize(const DisallowedFeatures& disallowed_features);
 
   const Validators* validators() const {
     return &validators_;
   }
 
   const ValueValidator<GLenum>& GetTextureFormatValidator(GLenum format) {
     return texture_format_validators_[format];
   }
 
   const std::string& extensions() const {
@@ skipping 12 matching lines @@
   friend class base::RefCounted<FeatureInfo>;
   friend class BufferManagerClientSideArraysTest;
   friend class GLES2DecoderTestBase;
 
   typedef base::hash_map<GLenum, ValueValidator<GLenum> > ValidatorMap;
   ValidatorMap texture_format_validators_;
 
   ~FeatureInfo();
 
   void AddExtensionString(const std::string& str);
+  void InitializeBasicState(const CommandLine& command_line);
+  void InitializeFeatures();
 
   Validators validators_;
 
   DisallowedFeatures disallowed_features_;
 
   // The extensions string returned by glGetString(GL_EXTENSIONS);
   std::string extensions_;
 
   // Flags for some features
   FeatureFlags feature_flags_;
 
   // Flags for Workarounds.
   Workarounds workarounds_;
 
   DISALLOW_COPY_AND_ASSIGN(FeatureInfo);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_