Readd the clipboard service and get it compiling again.

components/mus/mus_app.h

 // Copyright 2014 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 COMPONENTS_MUS_MUS_APP_H_
 #define COMPONENTS_MUS_MUS_APP_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
+#include "components/mus/public/interfaces/clipboard.mojom.h"
 #include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/gpu.mojom.h"
 #include "components/mus/public/interfaces/user_access_manager.mojom.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "components/mus/public/interfaces/window_server_test.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/platform_display_init_params.h"
 #include "components/mus/ws/user_id.h"
 #include "components/mus/ws/window_server_delegate.h"
@@ skipping 21 matching lines @@
 namespace mus {
 namespace ws {
 class ForwardingWindowManager;
 class PlatformScreen;
 class WindowServer;
 }
 
 class MusApp
     : public shell::ShellClient,
       public ws::WindowServerDelegate,
+      public shell::InterfaceFactory<mojom::Clipboard>,
       public shell::InterfaceFactory<mojom::DisplayManager>,
+      public shell::InterfaceFactory<mojom::Gpu>,
       public shell::InterfaceFactory<mojom::UserAccessManager>,
       public shell::InterfaceFactory<mojom::WindowManagerFactoryService>,
       public shell::InterfaceFactory<mojom::WindowTreeFactory>,
       public shell::InterfaceFactory<mojom::WindowTreeHostFactory>,
-      public shell::InterfaceFactory<mojom::WindowServerTest>,
-      public shell::InterfaceFactory<mojom::Gpu> {
+      public shell::InterfaceFactory<mojom::WindowServerTest> {
  public:
   MusApp();
   ~MusApp() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
   struct PendingRequest;
   struct UserState;
 
@@ skipping 14 matching lines @@
                   const shell::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
   // WindowServerDelegate:
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   bool IsTestConfig() const override;
   void CreateDefaultDisplays() override;
 
+  // shell::InterfaceFactory<mojom::Clipboard> implementation.
+  void Create(shell::Connection* connection,
+              mojom::ClipboardRequest request) override;
+
   // shell::InterfaceFactory<mojom::DisplayManager> implementation.
   void Create(shell::Connection* connection,
               mojom::DisplayManagerRequest request) override;
 
+  // shell::InterfaceFactory<mojom::Gpu> implementation.
+  void Create(shell::Connection* connection,
+              mojom::GpuRequest request) override;
+
   // shell::InterfaceFactory<mojom::UserAccessManager> implementation.
   void Create(shell::Connection* connection,
               mojom::UserAccessManagerRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
   void Create(shell::Connection* connection,
               mojom::WindowManagerFactoryServiceRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowTreeFactory>:
   void Create(shell::Connection* connection,
               mojom::WindowTreeFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowTreeHostFactory>:
   void Create(shell::Connection* connection,
               mojom::WindowTreeHostFactoryRequest request) override;
 
   // shell::InterfaceFactory<mojom::WindowServerTest> implementation.
   void Create(shell::Connection* connection,
               mojom::WindowServerTestRequest request) override;
 
-  // shell::InterfaceFactory<mojom::Gpu> implementation.
-  void Create(shell::Connection* connection,
-              mojom::GpuRequest request) override;
-
   // Callback for display configuration. |id| is the identifying token for the
   // configured display that will identify a specific physical display across
   // configuration changes. |bounds| is the bounds of the display in screen
   // coordinates.
   void OnCreatedPhysicalDisplay(int64_t id, const gfx::Rect& bounds);
 
   ws::PlatformDisplayInitParams platform_display_init_params_;
   std::unique_ptr<ws::WindowServer> window_server_;
   std::unique_ptr<ui::PlatformEventSource> event_source_;
   mojo::TracingImpl tracing_;
@@ skipping 10 matching lines @@
   std::unique_ptr<ws::PlatformScreen> platform_screen_;
 
   base::WeakPtrFactory<MusApp> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MusApp);
 };
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_MUS_APP_H_