services/ui: Revert CLs that broke Windows.

ui/views/mus/surface_binding.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 "ui/views/mus/surface_binding.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <utility>
@@ skipping 19 matching lines @@
 
 // PerClientState --------------------------------------------------------------
 
 // State needed per WindowTreeClient. Provides the real implementation of
 // CreateOutputSurface. SurfaceBinding obtains a pointer to the
 // PerClientState appropriate for the WindowTreeClient. PerClientState is
 // stored in a thread local map. When no more refereces to a PerClientState
 // remain the PerClientState is deleted and the underlying map cleaned up.
 class SurfaceBinding::PerClientState : public base::RefCounted<PerClientState> {
  public:
-  static PerClientState* Get(ui::WindowTreeClient* client);
+  static PerClientState* Get(shell::Connector* connector,
+                             ui::WindowTreeClient* client);
 
   std::unique_ptr<cc::OutputSurface> CreateOutputSurface(
       ui::Window* window,
       ui::mojom::SurfaceType type);
 
  private:
   typedef std::map<ui::WindowTreeClient*, PerClientState*> ClientToStateMap;
 
   friend class base::RefCounted<PerClientState>;
 
-  explicit PerClientState(ui::WindowTreeClient* client);
+  PerClientState(shell::Connector* connector, ui::WindowTreeClient* client);
   ~PerClientState();
 
   static base::LazyInstance<
       base::ThreadLocalPointer<ClientToStateMap>>::Leaky window_states;
 
+  shell::Connector* connector_;
   ui::WindowTreeClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(PerClientState);
 };
 
 // static
 base::LazyInstance<base::ThreadLocalPointer<
     SurfaceBinding::PerClientState::ClientToStateMap>>::Leaky
     SurfaceBinding::PerClientState::window_states;
 
 // static
 SurfaceBinding::PerClientState* SurfaceBinding::PerClientState::Get(
+    shell::Connector* connector,
     ui::WindowTreeClient* client) {
+  // |connector| can be null in some unit-tests.
+  if (!connector)
+    return nullptr;
   ClientToStateMap* window_map = window_states.Pointer()->Get();
   if (!window_map) {
     window_map = new ClientToStateMap;
     window_states.Pointer()->Set(window_map);
   }
   if (!(*window_map)[client])
-    (*window_map)[client] = new PerClientState(client);
+    (*window_map)[client] = new PerClientState(connector, client);
   return (*window_map)[client];
 }
 
 std::unique_ptr<cc::OutputSurface>
 SurfaceBinding::PerClientState::CreateOutputSurface(
     ui::Window* window,
     ui::mojom::SurfaceType surface_type) {
-  scoped_refptr<cc::ContextProvider> context_provider(new ui::ContextProvider);
+  scoped_refptr<cc::ContextProvider> context_provider(
+      new ui::ContextProvider(connector_));
   return base::WrapUnique(new ui::OutputSurface(
       context_provider, window->RequestSurface(surface_type)));
 }
 
-SurfaceBinding::PerClientState::PerClientState(ui::WindowTreeClient* client)
-    : client_(client) {}
+SurfaceBinding::PerClientState::PerClientState(shell::Connector* connector,
+                                               ui::WindowTreeClient* client)
+    : connector_(connector), client_(client) {}
 
 SurfaceBinding::PerClientState::~PerClientState() {
   ClientToStateMap* window_map = window_states.Pointer()->Get();
   DCHECK(window_map);
   DCHECK_EQ(this, (*window_map)[client_]);
   window_map->erase(client_);
   if (window_map->empty()) {
     delete window_map;
     window_states.Pointer()->Set(nullptr);
   }
 }
 
 // SurfaceBinding --------------------------------------------------------------
 
-SurfaceBinding::SurfaceBinding(ui::Window* window,
+SurfaceBinding::SurfaceBinding(shell::Connector* connector,
+                               ui::Window* window,
                                ui::mojom::SurfaceType surface_type)
     : window_(window),
       surface_type_(surface_type),
-      state_(PerClientState::Get(window->window_tree())) {}
+      state_(PerClientState::Get(connector, window->window_tree())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
 std::unique_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
   return state_ ? state_->CreateOutputSurface(window_, surface_type_) : nullptr;
 }
 
 }  // namespace views