Make mus_demo_unittests work with multiple root windows

ash/mus/app_launch_unittest.cc

Index: ash/mus/app_launch_unittest.cc
diff --git a/ash/mus/app_launch_unittest.cc b/ash/mus/app_launch_unittest.cc
index 7cf67d04777f9bd7ec45c3afa073d95f5c47f470..8a98538e90336fa50aeb52bc70dec64c7d771d24 100644
--- a/ash/mus/app_launch_unittest.cc
+++ b/ash/mus/app_launch_unittest.cc
@@ -13,8 +13,10 @@
 namespace ash {
 namespace mus {
 
-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();
 }
 
@@ -40,12 +42,12 @@ TEST_F(AppLaunchTest, TestQuickLaunch) {
   connector()->BindInterface(ui::mojom::kServiceName, &test_interface);
 
   base::RunLoop run_loop;
-  bool success = false;
-  test_interface->EnsureClientHasDrawnWindow(
+  uint64_t root_window_count = 0;
+  test_interface->EnsureClientHasDrawnRootWindows(
       mash::quick_launch::mojom::kServiceName,
-      base::Bind(&RunCallback, &success, run_loop.QuitClosure()));
+      base::Bind(&RunCallback, &root_window_count, run_loop.QuitClosure()));
   run_loop.Run();
-  EXPECT_TRUE(success);
+  EXPECT_EQ(1u, root_window_count);
 }
 
 }  // namespace mus