Revert of Pass initial size and GPU preference via context attributes

ui/compositor/test/in_process_context_provider.cc

 // Copyright (c) 2013 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 "ui/compositor/test/in_process_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 65 matching lines @@
 InProcessContextProvider::~InProcessContextProvider() {
   DCHECK(main_thread_checker_.CalledOnValidThread() ||
          context_thread_checker_.CalledOnValidThread());
 }
 
 bool InProcessContextProvider::BindToCurrentThread() {
   // This is called on the thread the context will be used.
   DCHECK(context_thread_checker_.CalledOnValidThread());
 
   if (!context_) {
+    gl::GpuPreference gpu_preference = gl::PreferDiscreteGpu;
     context_.reset(gpu::GLInProcessContext::Create(
         nullptr,  /* service */
         nullptr,  /* surface */
         !window_, /* is_offscreen */
-        window_, (shared_context_ ? shared_context_->context_.get() : nullptr),
-        attribs_, gpu::SharedMemoryLimits(), gpu_memory_buffer_manager_,
+        window_, gfx::Size(1, 1),
+        (shared_context_ ? shared_context_->context_.get() : nullptr), attribs_,
+        gpu_preference, gpu::SharedMemoryLimits(), gpu_memory_buffer_manager_,
         image_factory_));
 
     if (!context_)
       return false;
   }
 
   std::string unique_context_name =
       base::StringPrintf("%s-%p", debug_name_.c_str(), context_.get());
   context_->GetImplementation()->TraceBeginCHROMIUM(
       "gpu_toplevel", unique_context_name.c_str());
@@ skipping 59 matching lines @@
 uint32_t InProcessContextProvider::GetCopyTextureInternalFormat() {
   if (attribs_.alpha_size > 0)
     return GL_RGBA;
   DCHECK_NE(attribs_.red_size, 0);
   DCHECK_NE(attribs_.green_size, 0);
   DCHECK_NE(attribs_.blue_size, 0);
   return GL_RGB;
 }
 
 }  // namespace ui