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

ui/views/mus/mus_client.h

 // Copyright 2016 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_MUS_CLIENT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
 #include "ui/views/mus/mus_export.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace aura {
 class PropertyConverter;
-class MusContextFactory;
 class Window;
 class WindowTreeClient;
 }
 
 namespace base {
 class SingleThreadTaskRunner;
 class Thread;
 }
 
 namespace discardable_memory {
 class ClientDiscardableSharedMemoryManager;
 }
 
 namespace service_manager {
 class Connector;
 class Identity;
 }
 
-namespace ui {
-class Gpu;
-}
-
 namespace wm {
 class WMState;
 }
 
 namespace views {
 
 class MusClientObserver;
 class PointerWatcherEventRouter;
 class ScreenMus;
 
@@ skipping 37 matching lines @@
   ConfigurePropertiesFromParams(const Widget::InitParams& init_params);
 
   aura::WindowTreeClient* window_tree_client() {
     return window_tree_client_.get();
   }
 
   PointerWatcherEventRouter* pointer_watcher_event_router() {
     return pointer_watcher_event_router_.get();
   }
 
-  ui::Gpu* gpu() { return gpu_.get(); }
-
   // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
   // set as the factory function used for creating NativeWidgets when a
   //  NativeWidget has not been explicitly set.
   NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
                                    internal::NativeWidgetDelegate* delegate);
 
   void AddObserver(MusClientObserver* observer);
   void RemoveObserver(MusClientObserver* observer);
 
  private:
@@ skipping 28 matching lines @@
   // NOTE: this may be null (creation is based on argument supplied to
   // constructor).
   std::unique_ptr<wm::WMState> wm_state_;
 
   std::unique_ptr<ScreenMus> screen_;
 
   std::unique_ptr<aura::PropertyConverter> property_converter_;
 
   std::unique_ptr<aura::WindowTreeClient> window_tree_client_;
 
-  std::unique_ptr<ui::Gpu> gpu_;
-
   std::unique_ptr<PointerWatcherEventRouter> pointer_watcher_event_router_;
 
-  std::unique_ptr<aura::MusContextFactory> compositor_context_factory_;
-
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_H_