c++ / mojo changes for 'external window mode'

services/ui/ws/window_tree_client_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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 144 matching lines @@
 
     ASSERT_TRUE(wait_state_.get() == nullptr);
     wait_state_ = base::MakeUnique<WaitState>();
     wait_state_->change_count = count;
     wait_state_->run_loop.Run();
     wait_state_.reset();
   }
 
   uint32_t GetAndAdvanceChangeId() { return next_change_id_++; }
 
+  mojo::Binding<WindowTreeClient>& binding() { return binding_; }
+
   // Runs a nested MessageLoop until OnEmbed() has been encountered.
   void WaitForOnEmbed() {
     if (tree_)
       return;
     embed_run_loop_ = base::MakeUnique<base::RunLoop>();
     embed_run_loop_->Run();
     embed_run_loop_.reset();
   }
 
   bool WaitForChangeCompleted(uint32_t id) {
@@ skipping 478 matching lines @@
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface(client_factory_.get());
     return true;
   }
 
   void SetUp() override {
     client_factory_ = base::MakeUnique<WindowTreeClientFactory>();
 
     WindowServerServiceTestBase::SetUp();
 
-    mojom::WindowTreeHostFactoryPtr factory;
-    connector()->BindInterface(ui::mojom::kServiceName, &factory);
+    wt_client1_ = base::MakeUnique<TestWindowTreeClient>();
 
-    mojom::WindowTreeClientPtr tree_client_ptr;
-    wt_client1_ = base::MakeUnique<TestWindowTreeClient>();
-    wt_client1_->Bind(MakeRequest(&tree_client_ptr));
+    ui::mojom::WindowTreeHostFactoryRegistrarPtr host_factory_registrar;
+    connector()->BindInterface(ui::mojom::kServiceName,
+                               &host_factory_registrar);
 
-    factory->CreateWindowTreeHost(MakeRequest(&host_),
-                                  std::move(tree_client_ptr));
+    ui::mojom::WindowTreePtr window_tree;
+    ui::mojom::WindowTreeHostFactoryPtr window_tree_host_factory;
+    host_factory_registrar->Register(
+        MakeRequest(&window_tree_host_factory), MakeRequest(&window_tree),
+        wt_client1_->binding().CreateInterfacePtrAndBind());
+
+    window_tree_host_factory->CreateWindowTreeHost(MakeRequest(&host_));

[fwang, 2017/02/28 08:23:53]

As I see, we do not have test coverage for WindowTreeHost::SetSize and
WindowTreeHost::SetTitle. Probably something else to add in a follow-up CL...

 
     // Next we should get an embed call on the "window manager" client.
     wt_client1_->WaitForOnEmbed();
 
     ASSERT_EQ(1u, changes1()->size());
     EXPECT_EQ(CHANGE_TYPE_EMBED, (*changes1())[0].type);
     // All these tests assume 1 for the client id. The only real assertion here
     // is the client id is not zero, but adding this as rest of code here
     // assumes 1.
     ASSERT_GT((*changes1())[0].client_id, 0);
@@ skipping 1542 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace ui