Adds WindowManagerManager to mus

components/mus/ws/window_tree_unittest.cc

 // 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.
 
 #include <stdint.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ skipping 243 matching lines @@
 
   TestWindowTreeClient* last_client() {
     return last_connection_ ? last_connection_->client() : nullptr;
   }
 
   TestClientConnection* last_connection() { return last_connection_; }
 
  private:
   // ConnectionManagerDelegate:
   void OnNoMoreRootConnections() override {}
-
   ClientConnection* CreateClientConnectionForEmbedAtWindow(
       ConnectionManager* connection_manager,
       mojo::InterfaceRequest<mus::mojom::WindowTree> service_request,
       ServerWindow* root,
       uint32_t policy_bitmask,
       mus::mojom::WindowTreeClientPtr client) override {
-    // Used by ConnectionManager::AddRoot.
     scoped_ptr<WindowTreeImpl> service(
         new WindowTreeImpl(connection_manager, root, policy_bitmask));
     last_connection_ = new TestClientConnection(std::move(service));
     return last_connection_;
   }
+  ClientConnection* CreateClientConnectionForWindowManager(
+      WindowTreeHostImpl* tree_host,
+      ServerWindow* window,
+      const mojom::Display& display,
+      uint32_t user_id,
+      mojom::WindowManagerFactory* factory) override {
+    NOTREACHED();
+    return nullptr;
+  }
+  void CreateDefaultWindowTreeHosts() override { NOTREACHED(); }
 
   TestClientConnection* last_connection_;
   WindowTreeHostImpl* window_tree_host_;
 
   DISALLOW_COPY_AND_ASSIGN(TestConnectionManagerDelegate);
 };
 
 // -----------------------------------------------------------------------------
 
 class TestWindowTreeHostConnection : public WindowTreeHostConnection {
@@ skipping 347 matching lines @@
   DispatchEventAndAckImmediately(CreatePointerUpEvent(21, 22));
   wm_client()->tracker()->changes()->clear();
   connection1_client->tracker()->changes()->clear();
 
   // Press in the same location. Should not get a focus change event (only input
   // event).
   DispatchEventAndAckImmediately(CreatePointerDownEvent(61, 22));
   EXPECT_EQ(child1, window_tree_host_->GetFocusedWindow());
   ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u)
       << SingleChangeToDescription(*wm_client()->tracker()->changes());
-  EXPECT_EQ("InputEvent window=0,2 event_action=4",
+  EXPECT_EQ("InputEvent window=0,3 event_action=4",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   EXPECT_TRUE(connection1_client->tracker()->changes()->empty());
 }
 
 TEST_F(WindowTreeTest, BasicInputEventTarget) {
   TestWindowTreeClient* embed_connection = nullptr;
   WindowTreeImpl* window_tree_connection = nullptr;
   ServerWindow* window = nullptr;
   EXPECT_NO_FATAL_FAILURE(
       SetupEventTargeting(&embed_connection, &window_tree_connection, &window));
@@ skipping 157 matching lines @@
       wm_connection()->NewWindow(embed_window_id, ServerWindow::Properties()));
   EXPECT_TRUE(wm_connection()->SetWindowVisibility(embed_window_id, true));
   ASSERT_TRUE(FirstRoot(wm_connection()));
   EXPECT_TRUE(wm_connection()->AddWindow(FirstRootId(wm_connection()),
                                          embed_window_id));
   window_tree_host_->root_window()->SetBounds(gfx::Rect(0, 0, 100, 100));
 
   wm_client()->tracker()->changes()->clear();
   DispatchEventWithoutAck(CreateMouseMoveEvent(21, 22));
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
-  EXPECT_EQ("InputEvent window=0,2 event_action=5",
+  EXPECT_EQ("InputEvent window=0,3 event_action=5",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   wm_client()->tracker()->changes()->clear();
 
   // Send another event. This event shouldn't reach the client.
   DispatchEventWithoutAck(CreateMouseMoveEvent(21, 22));
   ASSERT_EQ(0u, wm_client()->tracker()->changes()->size());
 
   // Ack the first event. That should trigger the dispatch of the second event.
   AckPreviousEvent();
   ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
-  EXPECT_EQ("InputEvent window=0,2 event_action=5",
+  EXPECT_EQ("InputEvent window=0,3 event_action=5",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
 }
 
 // Establish connection, call NewTopLevelWindow(), make sure get id, and make
 // sure client paused.
 TEST_F(WindowTreeTest, NewTopLevelWindow) {
   TestWindowManager wm_internal;
   set_window_manager_internal(wm_connection(), &wm_internal);
   TestWindowTreeClient* embed_connection = nullptr;
   WindowTreeImpl* window_tree_connection = nullptr;
@@ skipping 96 matching lines @@
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(root_window->id()));
   EXPECT_EQ(window, host->GetCaptureWindow());
   mojom_window_tree->ReleaseCapture(++change_id,
                                     WindowIdToTransportId(window->id()));
   EXPECT_EQ(nullptr, host->GetCaptureWindow());
 }
 
 }  // namespace ws
 }  // namespace mus