services/ui: Revert CLs that broke Windows.

services/ui/public/cpp/lib/context_provider.cc

 // Copyright 2014 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 "services/ui/public/cpp/context_provider.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
+#include "services/shell/public/cpp/connector.h"
 #include "services/ui/public/cpp/gles2_context.h"
 
 namespace ui {
 
-ContextProvider::ContextProvider() {}
+ContextProvider::ContextProvider(shell::Connector* connector)
+    : connector_(connector->Clone()) {}
 
 bool ContextProvider::BindToCurrentThread() {
-  context_ = GLES2Context::CreateOffscreenContext(std::vector<int32_t>());
+  if (connector_) {
+    context_ = GLES2Context::CreateOffscreenContext(std::vector<int32_t>(),
+                                                    connector_.get());
+    // We don't need the connector anymore, so release it.
+    connector_.reset();
+  }
   return !!context_;
 }
 
 gpu::gles2::GLES2Interface* ContextProvider::ContextGL() {
   return context_->interface();
 }
 
 gpu::ContextSupport* ContextProvider::ContextSupport() {
   if (!context_)
     return NULL;
@@ skipping 17 matching lines @@
 base::Lock* ContextProvider::GetLock() {
   // This context provider is not used on multiple threads.
   NOTREACHED();
   return nullptr;
 }
 
 ContextProvider::~ContextProvider() {
 }
 
 }  // namespace ui