views/mus: Create the BitmapUploader only when needed.

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 61 matching lines @@
 
 // static
 base::LazyInstance<base::ThreadLocalPointer<
     SurfaceBinding::PerClientState::ClientToStateMap>>::Leaky
     SurfaceBinding::PerClientState::window_states;
 
 // static
 SurfaceBinding::PerClientState* SurfaceBinding::PerClientState::Get(
     shell::Connector* connector,
     mus::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(connector, client);
     (*window_map)[client]->Init();
   }
   return (*window_map)[client];
@@ skipping 47 matching lines @@
 SurfaceBinding::SurfaceBinding(shell::Connector* connector,
                                mus::Window* window,
                                mus::mojom::SurfaceType surface_type)
     : window_(window),
       surface_type_(surface_type),
       state_(PerClientState::Get(connector, window->window_tree())) {}
 
 SurfaceBinding::~SurfaceBinding() {}
 
 std::unique_ptr<cc::OutputSurface> SurfaceBinding::CreateOutputSurface() {
-  return state_->CreateOutputSurface(window_, surface_type_);
+  return state_ ? state_->CreateOutputSurface(window_, surface_type_) : nullptr;
 }
 
 }  // namespace views