Revert of Pass initial size and GPU preference via context attributes

cc/test/test_in_process_context_provider.cc

 // Copyright 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 "cc/test/test_in_process_context_provider.h"
 
 #include <stdint.h>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 21 matching lines @@
     gpu::GLInProcessContext* shared_context) {
   const bool is_offscreen = true;
   gpu::gles2::ContextCreationAttribHelper attribs;
   attribs.alpha_size = -1;
   attribs.depth_size = 24;
   attribs.stencil_size = 8;
   attribs.samples = 0;
   attribs.sample_buffers = 0;
   attribs.fail_if_major_perf_caveat = false;
   attribs.bind_generates_resource = false;
+  gl::GpuPreference gpu_preference = gl::PreferDiscreteGpu;
 
   std::unique_ptr<gpu::GLInProcessContext> context =
       base::WrapUnique(gpu::GLInProcessContext::Create(
           nullptr, nullptr, is_offscreen, gfx::kNullAcceleratedWidget,
-          shared_context, attribs, gpu::SharedMemoryLimits(),
-          gpu_memory_buffer_manager, image_factory));
+          gfx::Size(1, 1), shared_context, attribs, gpu_preference,
+          gpu::SharedMemoryLimits(), gpu_memory_buffer_manager, image_factory));
 
   DCHECK(context);
   return context;
 }
 
 std::unique_ptr<gpu::GLInProcessContext> CreateTestInProcessContext() {
   return CreateTestInProcessContext(nullptr, nullptr, nullptr);
 }
 
 TestInProcessContextProvider::TestInProcessContextProvider(
@@ skipping 53 matching lines @@
 
 void TestInProcessContextProvider::DeleteCachedResources() {
   if (gr_context_)
     gr_context_->FreeGpuResources();
 }
 
 void TestInProcessContextProvider::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {}
 
 }  // namespace cc