Reland of Improves focus/activation for aura-mus and DesktopNativeWidgetAura

ui/aura/test/aura_test_helper.cc

 // Copyright (c) 2012 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/aura/test/aura_test_helper.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/default_capture_client.h"
@@ skipping 77 matching lines @@
   focus_client_ = base::MakeUnique<TestFocusClient>();
   capture_client_ = base::MakeUnique<client::DefaultCaptureClient>();
   Env::WindowPortFactory window_impl_factory =
       base::Bind(&AuraTestHelper::CreateWindowPort, base::Unretained(this));
   if (mode_ == Mode::MUS_CREATE_WINDOW_TREE_CLIENT)
     InitWindowTreeClient();
   if (!Env::GetInstanceDontCreate())
     env_ = Env::CreateInstance(window_impl_factory);
   else
     EnvTestHelper(Env::GetInstance()).SetWindowPortFactory(window_impl_factory);
+  Env::GetInstance()->SetActiveFocusClient(focus_client_.get(), nullptr);
   Env::GetInstance()->set_context_factory(context_factory);
   // Unit tests generally don't want to query the system, rather use the state
   // from RootWindow.
   EnvTestHelper env_helper(Env::GetInstance());
   env_helper.SetInputStateLookup(nullptr);
   env_helper.ResetEventState();
 
   ui::InitializeInputMethodForTesting();
 
   display::Screen* screen = display::Screen::GetScreen();
@@ skipping 25 matching lines @@
   host_.reset();
   ui::GestureRecognizer::Reset();
   if (display::Screen::GetScreen() == test_screen_.get())
     display::Screen::SetScreenInstance(nullptr);
   test_screen_.reset();
 
 #if defined(USE_X11)
   ui::test::ResetXCursorCache();
 #endif
 
+  Env::GetInstance()->SetActiveFocusClient(nullptr, nullptr);
   window_tree_client_setup_.reset();
   focus_client_.reset();
   capture_client_.reset();
 
   ui::ShutdownInputMethodForTesting();
 
   if (env_) {
     env_.reset();
   } else {
     EnvTestHelper(Env::GetInstance())
@@ skipping 34 matching lines @@
         base::MakeUnique<WindowPortLocal>(window);
     return std::move(window_port);
   }
   std::unique_ptr<WindowPortMus> window_port = base::MakeUnique<WindowPortMus>(
       window_tree_client_, WindowMusType::LOCAL);
   return std::move(window_port);
 }
 
 }  // namespace test
 }  // namespace aura