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

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

 // Copyright 2015 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/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u) {}
 
 BitmapUploader::~BitmapUploader() {
 }
 
-void BitmapUploader::Init(shell::Connector* connector) {
+void BitmapUploader::Init() {
   surface_ = window_->RequestSurface(mojom::SurfaceType::DEFAULT);
   surface_->BindToThread();
   surface_->set_client(this);
 
-  gles2_context_ = GLES2Context::CreateOffscreenContext(
-      std::vector<int32_t>(), connector);
+  gles2_context_ = GLES2Context::CreateOffscreenContext(std::vector<int32_t>());
   // CreateOffscreenContext() may return null.
 }
 
 // Sets the color which is RGBA.
 void BitmapUploader::SetColor(uint32_t color) {
   if (color_ == color)
     return;
   color_ = color;
   if (surface_)
     Upload();
@@ skipping 136 matching lines @@
     DCHECK_EQ(1, resource.count);
     gl->WaitSyncTokenCHROMIUM(resource.sync_token.GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource.id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource.id);
     gl->DeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace ui