Fixes bug in DesktopWindowTreeHostMus's activation handling

ui/views/mus/desktop_window_tree_host_mus_unittest.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 "ui/views/mus/desktop_window_tree_host_mus.h"
 
 #include "base/debug/stack_trace.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/cursor_client.h"
+#include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/transient_window_client.h"
+#include "ui/aura/env.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/in_flight_change.h"
 #include "ui/aura/mus/window_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/mus/change_completion_waiter.h"
 #include "ui/aura/window.h"
 #include "ui/views/mus/mus_client.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 150 matching lines @@
 }
 
 TEST_F(DesktopWindowTreeHostMusTest, Deactivate) {
   std::unique_ptr<Widget> widget1(CreateWidget());
   widget1->Show();
 
   std::unique_ptr<Widget> widget2(CreateWidget());
   widget2->Show();
 
   widget1->Activate();
+  EXPECT_TRUE(widget1->GetNativeWindow()->HasFocus());
+
   RunPendingMessages();
   EXPECT_TRUE(widget1->IsActive());
+  EXPECT_TRUE(widget1->GetNativeWindow()->HasFocus());
   EXPECT_EQ(widget_activated(), widget1.get());
 
   DeactivateAndWait(widget1.get());
   EXPECT_FALSE(widget1->IsActive());
 }
 
+TEST_F(DesktopWindowTreeHostMusTest, ActivateBeforeShow) {
+  std::unique_ptr<Widget> widget1(CreateWidget());
+  // Activation can be attempted before visible.
+  widget1->Activate();
+  widget1->Show();
+  widget1->Activate();
+  EXPECT_TRUE(widget1->IsActive());
+  // The Widget's NativeWindow (|DesktopNativeWidgetAura::content_window_|)
+  // should be active.
+  EXPECT_TRUE(widget1->GetNativeWindow()->HasFocus());
+  // Env's active FocusClient should match the active window.
+  aura::client::FocusClient* widget_focus_client =
+      aura::client::GetFocusClient(widget1->GetNativeWindow());
+  ASSERT_TRUE(widget_focus_client);
+  EXPECT_EQ(widget_focus_client,
+            aura::Env::GetInstance()->active_focus_client());
+}
+
 TEST_F(DesktopWindowTreeHostMusTest, CursorClientDuringTearDown) {
   std::unique_ptr<Widget> widget(CreateWidget());
   widget->Show();
 
   std::unique_ptr<aura::Window> window(new aura::Window(nullptr));
   window->Init(ui::LAYER_SOLID_COLOR);
   ExpectsNullCursorClientDuringTearDown observer(window.get());
 
   widget->GetNativeWindow()->AddChild(window.release());
   widget.reset();
@@ skipping 56 matching lines @@
   aura::client::TransientWindowClient* transient_window_client =
       aura::client::GetTransientWindowClient();
   // Even though the widget1->GetNativeView() was specified as the parent we
   // expect the transient parents to be marked at the host level.
   EXPECT_EQ(widget1->GetNativeView()->GetHost()->window(),
             transient_window_client->GetTransientParent(
                 widget2->GetNativeView()->GetHost()->window()));
 }
 
 }  // namespace views