Merge 131559 - Revert 131177 - aura: Change shared context to be offscreen for arm

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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/gles2_cmd_decoder_unittest_base.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/string_number_conversions.h"
@@ skipping 181 matching lines @@
   int32 attributes[] = {
     EGL_ALPHA_SIZE, request_alpha ? 8 : 0,
     EGL_DEPTH_SIZE, request_depth ? 24 : 0,
     EGL_STENCIL_SIZE, request_stencil ? 8 : 0,
   };
   std::vector<int32> attribs(attributes, attributes + arraysize(attributes));
 
   decoder_.reset(GLES2Decoder::Create(group_.get()));
   decoder_->set_log_synthesized_gl_errors(false);
   decoder_->Initialize(
-      surface_, context_, false, surface_->GetSize(), DisallowedFeatures(),
+      surface_, context_, surface_->GetSize(), DisallowedFeatures(),
       NULL, attribs);
   decoder_->set_engine(engine_.get());
 
   EXPECT_CALL(*gl_, GenBuffersARB(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceBufferId))
       .RetiresOnSaturation();
   GenHelper<GenBuffersImmediate>(client_buffer_id_);
   EXPECT_CALL(*gl_, GenFramebuffersEXT(_, _))
       .WillOnce(SetArgumentPointee<1>(kServiceFramebufferId))
       .RetiresOnSaturation();
@@ skipping 970 matching lines @@
       num_vertices, buffer_id, GL_NO_ERROR);
 }
 
 void GLES2DecoderWithShaderTestBase::SetUp() {
   GLES2DecoderTestBase::SetUp();
   SetupDefaultProgram();
 }
 
 }  // namespace gles2
 }  // namespace gpu