Revert of Pass initial size and GPU preference via context attributes

gpu/command_buffer/common/gles2_cmd_utils.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.
 
 // This file is here so other GLES2 related files can have a common set of
 // includes where appropriate.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
 #define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/numerics/safe_math.h"
 #include "gpu/command_buffer/common/gles2_utils_export.h"
-#include "ui/gfx/geometry/size.h"
-#include "ui/gl/gpu_preference.h"
 
 namespace gpu {
 namespace gles2 {
 
 // Does a multiply and checks for overflow.  If the multiply did not overflow
 // returns true.
 
 // Multiplies 2 32 bit unsigned numbers checking for overflow.
 // If there was no overflow returns true.
 inline bool SafeMultiplyUint32(uint32_t a, uint32_t b, uint32_t* dst) {
@@ skipping 269 matching lines @@
   CONTEXT_TYPE_OPENGLES3,
   CONTEXT_TYPE_LAST = CONTEXT_TYPE_OPENGLES3
 };
 
 struct GLES2_UTILS_EXPORT ContextCreationAttribHelper {
   ContextCreationAttribHelper();
   ContextCreationAttribHelper(const ContextCreationAttribHelper& other);
 
   bool Parse(const std::vector<int32_t>& attribs);
 
-  gfx::Size offscreen_framebuffer_size;
-  gl::GpuPreference gpu_preference;
   // -1 if invalid or unspecified.
   int32_t alpha_size;
   int32_t blue_size;
   int32_t green_size;
   int32_t red_size;
   int32_t depth_size;
   int32_t stencil_size;
   int32_t samples;
   int32_t sample_buffers;
   bool buffer_preserved;
   bool bind_generates_resource;
   bool fail_if_major_perf_caveat;
   bool lose_context_when_out_of_memory;
   bool should_use_native_gmb_for_backbuffer;
 
   ContextType context_type;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_UTILS_H_