Makes WindowTree::SetFocus(null) work

components/mus/ws/window_manager_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/logging.h"
 #include "base/macros.h"
@@ skipping 740 matching lines @@
     FocusChangeObserver observer(window11);
     observer.set_quit_on_change(false);
     GetFirstRoot(embedded)->SetFocus();
     ASSERT_NE(nullptr, observer.last_gained_focus());
     ASSERT_NE(nullptr, observer.last_lost_focus());
     EXPECT_EQ(window11->id(), observer.last_lost_focus()->id());
     EXPECT_EQ(GetFirstRoot(embedded)->id(), observer.last_gained_focus()->id());
   }
 }
 
+TEST_F(WindowServerTest, ClearFocus) {
+  Window* window1 = window_manager()->NewWindow();
+  window1->SetVisible(true);
+  GetFirstWMRoot()->AddChild(window1);
+
+  WindowTreeConnection* embedded = Embed(window1).connection;
+  ASSERT_NE(nullptr, embedded);
+  Window* window11 = embedded->NewWindow();
+  window11->SetVisible(true);
+  GetFirstRoot(embedded)->AddChild(window11);
+
+  // Focus the embed root in |embedded|.
+  Window* embedded_root = GetFirstRoot(embedded);
+  {
+    FocusChangeObserver observer(embedded_root);
+    observer.set_quit_on_change(false);
+    embedded_root->SetFocus();
+    ASSERT_TRUE(embedded_root->HasFocus());
+    ASSERT_NE(nullptr, observer.last_gained_focus());
+    EXPECT_EQ(embedded_root->id(), observer.last_gained_focus()->id());
+
+    // |embedded_root| is the same as |window1|, make sure |window1| got
+    // focus too.
+    ASSERT_TRUE(WaitForWindowToHaveFocus(window1));
+  }
+
+  {
+    FocusChangeObserver observer(window1);
+    embedded->ClearFocus();
+    ASSERT_FALSE(embedded_root->HasFocus());
+    EXPECT_FALSE(embedded->GetFocusedWindow());
+
+    ASSERT_TRUE(WindowServerTestBase::DoRunLoopWithTimeout());
+    EXPECT_FALSE(window1->HasFocus());
+    EXPECT_FALSE(window_manager()->GetFocusedWindow());
+  }
+}
+
 TEST_F(WindowServerTest, FocusNonFocusableWindow) {
   Window* window = window_manager()->NewWindow();
   window->SetVisible(true);
   GetFirstWMRoot()->AddChild(window);
 
   WindowTreeConnection* connection = Embed(window).connection;
   ASSERT_NE(nullptr, connection);
   ASSERT_FALSE(connection->GetRoots().empty());
   Window* client_window = *connection->GetRoots().begin();
   client_window->SetCanFocus(false);
@@ skipping 331 matching lines @@
   ASSERT_TRUE(window_in_wm);
 
   // Change the bounds in the wm, and make sure the child sees it.
   window_in_wm->SetBounds(gfx::Rect(1, 11, 12, 101));
   ASSERT_TRUE(WaitForBoundsToChange(window_in_second_connection));
   EXPECT_EQ(gfx::Rect(1, 11, 12, 101), window_in_second_connection->bounds());
 }
 
 }  // namespace ws
 }  // namespace mus