Make mus_demo_unittests work with multiple root windows

services/ui/demo/mus_demo_unittests.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "services/service_manager/public/cpp/service_test.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_server_test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace ui {
 namespace demo {
 
 namespace {
 
 const char kTestAppName[] = "mus_demo_unittests";
 
-void RunCallback(bool* success, const base::Closure& callback, bool result) {
-  *success = result;
+void RunCallback(uint64_t* root_window_count,
+                 const base::Closure& callback,
+                 uint64_t result) {
+  *root_window_count = result;
   callback.Run();
 }
 
 class MusDemoTest : public service_manager::test::ServiceTest {
  public:
   MusDemoTest() : service_manager::test::ServiceTest(kTestAppName) {}
   ~MusDemoTest() override {}
 
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch("use-test-config");
     ServiceTest::SetUp();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MusDemoTest);
 };
 
 }  // namespace
 
 TEST_F(MusDemoTest, CheckMusDemoDraws) {
   connector()->Connect("mus_demo");
 
   ::ui::mojom::WindowServerTestPtr test_interface;
   connector()->BindInterface(ui::mojom::kServiceName, &test_interface);
 
   base::RunLoop run_loop;
-  bool success = false;
+  uint64_t root_window_count = 0;
   // TODO(kylechar): Fix WindowServer::CreateTreeForWindowManager so that the
   // WindowTree has the correct name instead of an empty name.
-  test_interface->EnsureClientHasDrawnWindow(
+  // TODO(tonikitoo,fwang): Also fix the WindowTree name for MusDemoExternal.
+  test_interface->EnsureClientHasDrawnRootWindows(
       "",  // WindowTree name is empty.
-      base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
+      base::Bind(&RunCallback, &root_window_count, run_loop.QuitClosure()));
   run_loop.Run();
-  EXPECT_TRUE(success);
+  // TODO(tonikitoo,fwang): Test multiple windows for MusDemoExternal.
+  EXPECT_EQ(1u, root_window_count);
 }
 
 }  // namespace demo
 }  // namespace ui