Routes calls to WM through WS

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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "components/mus/public/cpp/types.h"
 #include "components/mus/public/cpp/util.h"
@@ skipping 299 matching lines @@
 
  protected:
   // testing::Test:
   void SetUp() override {
     DisplayManager::set_factory_for_testing(&display_manager_factory_);
     // TODO(fsamuel): This is probably broken. We need a root.
     connection_manager_.reset(
         new ConnectionManager(&delegate_, scoped_refptr<SurfacesState>()));
     WindowTreeHostImpl* host = new WindowTreeHostImpl(
         mus::mojom::WindowTreeHostClientPtr(), connection_manager_.get(),
-        nullptr, scoped_refptr<GpuState>(),
-        scoped_refptr<mus::SurfacesState>());
+        nullptr, scoped_refptr<GpuState>(), scoped_refptr<mus::SurfacesState>(),
+        nullptr);
     // TODO(fsamuel): This is way too magical. We need to find a better way to
     // manage lifetime.
     host_connection_ = new TestWindowTreeHostConnection(
         make_scoped_ptr(host), connection_manager_.get());
     host->Init(host_connection_);
     wm_client_ = delegate_.last_client();
   }
 
  private:
   // TestWindowTreeClient that is used for the WM connection.
@@ skipping 122 matching lines @@
   ASSERT_EQ(2u, embed_connection->tracker()->changes()->size());
   EXPECT_EQ("Focused id=2,1",
             ChangesToDescription1(*embed_connection->tracker()->changes())[0]);
   EXPECT_EQ("InputEvent window=2,1 event_action=4",
             ChangesToDescription1(*embed_connection->tracker()->changes())[1]);
 }
 
 }  // namespace ws
 
 }  // namespace mus