Revert of Fix initialization ordering in GLES2CmdDecoder.

gpu/command_buffer/tests/gl_manager.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/tests/gl_manager.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 #include <GLES2/gl2extchromium.h>
 #include <stddef.h>
@@ skipping 169 matching lines @@
       share_group_manager(NULL),
       share_mailbox_manager(NULL),
       virtual_manager(NULL),
       bind_generates_resource(false),
       lose_context_when_out_of_memory(false),
       context_lost_allowed(false),
       context_type(gles2::CONTEXT_TYPE_OPENGLES2),
       force_shader_name_hashing(false),
       multisampled(false),
       backbuffer_alpha(true),
-      image_factory(nullptr) {}
+      image_factory(nullptr),
+      enable_arb_texture_rectangle(false) {}
 
 GLManager::GLManager()
     : sync_point_manager_(nullptr),
       context_lost_allowed_(false),
       pause_commands_(false),
       paused_order_num_(0),
       command_buffer_id_(
           CommandBufferId::FromUnsafeValue(g_next_command_buffer_id++)),
       next_fence_sync_release_(1) {
   SetupBaseContext();
@@ skipping 89 matching lines @@
   attribs.sample_buffers = options.multisampled ? 1 : 0;
   attribs.alpha_size = options.backbuffer_alpha ? 8 : 0;
   attribs.should_use_native_gmb_for_backbuffer =
       options.image_factory != nullptr;
   attribs.offscreen_framebuffer_size = options.size;
 
   if (!context_group) {
     GpuDriverBugWorkarounds gpu_driver_bug_workaround(&command_line);
     scoped_refptr<gles2::FeatureInfo> feature_info =
         new gles2::FeatureInfo(command_line, gpu_driver_bug_workaround);
+    if (options.enable_arb_texture_rectangle) {
+      gles2::FeatureInfo::FeatureFlags& flags =
+          const_cast<gles2::FeatureInfo::FeatureFlags&>(
+              feature_info->feature_flags());
+      flags.arb_texture_rectangle = true;
+    }
     context_group = new gles2::ContextGroup(
         gpu_preferences_, mailbox_manager_.get(), NULL,
         new gpu::gles2::ShaderTranslatorCache(gpu_preferences_),
         new gpu::gles2::FramebufferCompletenessCache, feature_info,
         options.bind_generates_resource, options.image_factory);
   }
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group));
   if (options.force_shader_name_hashing) {
     decoder_->SetForceShaderNameHashingForTest(true);
@@ skipping 336 matching lines @@
 
   // Something went wrong, just run the callback now.
   callback.Run();
 }
 
 bool GLManager::CanWaitUnverifiedSyncToken(const gpu::SyncToken* sync_token) {
   return false;
 }
 
 }  // namespace gpu