aura: Some change to how the client-lib is set up.

services/ui/ws/window_server_test_base.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 SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_
 
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/window_server_service_test_base.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/display/screen_base.h"
 #include "ui/wm/core/wm_state.h"
 
 namespace aura {
 class Env;
-class MusContextFactory;
 }
 
 namespace ui {
-class Gpu;
 
 // WindowServerTestBase is a base class for use with shell tests that use
 // WindowServer. SetUp() connects to the WindowServer and blocks until OnEmbed()
 // has been invoked. window_manager() can be used to access the WindowServer
 // established as part of SetUp().
 class WindowServerTestBase
     : public WindowServerServiceTestBase,
       public aura::WindowTreeClientDelegate,
       public aura::WindowManagerDelegate,
       public service_manager::InterfaceFactory<mojom::WindowTreeClient> {
@@ skipping 90 matching lines @@
   // Removes |window_tree_host| from |window_tree_hosts_| and deletes it.
   // Returns true on success, and false if not found, in which case
   // |window_tree_host| is not deleted.
   bool DeleteWindowTreeHost(aura::WindowTreeHostMus* window_tree_host);
 
   std::unique_ptr<aura::Env> env_;
   ::wm::WMState wm_state_;
   display::ScreenBase screen_;
   aura::PropertyConverter property_converter_;
 
-  std::unique_ptr<Gpu> gpu_;
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
-
   std::vector<std::unique_ptr<aura::WindowTreeClient>> window_tree_clients_;
 
   std::vector<std::unique_ptr<aura::WindowTreeHostMus>> window_tree_hosts_;
 
   // The window server connection held by the window manager (app running at
   // the root window).
   aura::WindowTreeClient* window_manager_ = nullptr;
 
   // A test can override the WM-related behaviour by installing its own
   // WindowManagerDelegate during the test.
   aura::WindowManagerDelegate* window_manager_delegate_ = nullptr;
 
   aura::WindowManagerClient* window_manager_client_ = nullptr;
 
   bool window_tree_client_lost_connection_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServerTestBase);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_TEST_BASE_H_