Revert of services/ui: Revert CLs that broke Windows.

services/ui/public/cpp/gles2_context.h

Index: services/ui/public/cpp/gles2_context.h
diff --git a/services/ui/public/cpp/gles2_context.h b/services/ui/public/cpp/gles2_context.h
index 280f4a7d7b52ad7ea2b8a3ca7d5c0bb6fae3b195..d26499d7494bd5ca61eef01229721555d81ea002 100644
--- a/services/ui/public/cpp/gles2_context.h
+++ b/services/ui/public/cpp/gles2_context.h
@@ -22,10 +22,6 @@
 }
 }
 
-namespace shell {
-class Connector;
-}
-
 namespace ui {
 
 class CommandBufferClientImpl;
@@ -39,13 +35,11 @@
   gpu::ContextSupport* context_support() const { return implementation_.get(); }
 
   static std::unique_ptr<GLES2Context> CreateOffscreenContext(
-      const std::vector<int32_t>& attribs,
-      shell::Connector* connector);
+      const std::vector<int32_t>& attribs);
 
  private:
   GLES2Context();
-  bool Initialize(const std::vector<int32_t>& attribs,
-                  shell::Connector* connector);
+  bool Initialize(const std::vector<int32_t>& attribs);
 
   std::unique_ptr<CommandBufferClientImpl> command_buffer_client_impl_;
   std::unique_ptr<gpu::CommandBufferProxyImpl> command_buffer_proxy_impl_;