Eliminate WindowTreeConnection

ui/views/mus/surface_binding.h

 // 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.
 
 #ifndef UI_VIEWS_MUS_SURFACE_BINDING_H_
 #define UI_VIEWS_MUS_SURFACE_BINDING_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 25 matching lines @@
   SurfaceBinding(shell::Connector* connector,
                  mus::Window* window,
                  mus::mojom::SurfaceType surface_type);
   ~SurfaceBinding();
 
   // Creates an OutputSurface that renders to the Window supplied to the
   // constructor.
   std::unique_ptr<cc::OutputSurface> CreateOutputSurface();
 
  private:
-  class PerConnectionState;
+  class PerClientState;
 
   mus::Window* window_;
   const mus::mojom::SurfaceType surface_type_;
-  scoped_refptr<PerConnectionState> state_;
+  scoped_refptr<PerClientState> state_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceBinding);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_SURFACE_BINDING_H_