Update from chromium https://crrev.com/304586

gpu/command_buffer/tests/gl_manager.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.
 
 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/client/gpu_control.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/size.h"
 
+namespace base {
+class CommandLine;
+}
+
 namespace gfx {
 
 class GLContext;
 class GLShareGroup;
 class GLSurface;
 
 }
 
 namespace gpu {
 
@@ skipping 33 matching lines @@
     bool context_lost_allowed;
   };
   GLManager();
   ~GLManager() override;
 
   static scoped_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::GpuMemoryBuffer::Format format);
 
   void Initialize(const Options& options);
+  void InitializeWithCommandLine(const Options& options,
+                                 base::CommandLine* command_line);
   void Destroy();
 
   void MakeCurrent();
 
   void SetSurface(gfx::GLSurface* surface);
 
   gles2::GLES2Decoder* decoder() const {
     return decoder_.get();
   }
 
@@ skipping 55 matching lines @@
   // Used on Android to virtualize GL for all contexts.
   static int use_count_;
   static scoped_refptr<gfx::GLShareGroup>* base_share_group_;
   static scoped_refptr<gfx::GLSurface>* base_surface_;
   static scoped_refptr<gfx::GLContext>* base_context_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_