Moves TransientWindowClient to ui/aura/client and adds observer

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/bind.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"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/input_state_lookup.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/test/env_test_helper.h"
 #include "ui/aura/test/event_generator_delegate_aura.h"
 #include "ui/aura/test/mus/test_window_tree.h"
 #include "ui/aura/test/mus/test_window_tree_client_setup.h"
 #include "ui/aura/test/test_focus_client.h"
 #include "ui/aura/test/test_screen.h"
 #include "ui/aura/test/test_window_parenting_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ime/input_method_factory.h"
 #include "ui/base/ime/input_method_initializer.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/screen.h"
+#include "ui/wm/core/wm_state.h"
 
 #if defined(USE_X11)
 #include "ui/aura/window_tree_host_x11.h"
 #include "ui/base/x/x11_util.h"  // nogncheck
 #endif
 
 namespace aura {
 namespace test {
 
 AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop)
@@ skipping 21 matching lines @@
                                WindowManagerDelegate* window_manager_delegate) {
   DCHECK(!setup_called_);
   use_mus_ = true;
   window_tree_delegate_ = window_tree_delegate;
   window_manager_delegate_ = window_manager_delegate;
 }
 
 void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
   setup_called_ = true;
 
+  wm_state_ = base::MakeUnique<wm::WMState>();
   // Needs to be before creating WindowTreeClient.
   focus_client_ = base::MakeUnique<TestFocusClient>();
   capture_client_ = base::MakeUnique<client::DefaultCaptureClient>();
   Env::WindowPortFactory window_impl_factory;
   if (use_mus_)
     window_impl_factory = InitMus();
   if (!Env::GetInstanceDontCreate())
     env_ = aura::Env::CreateInstance(window_impl_factory);
   else if (use_mus_)
     EnvTestHelper(Env::GetInstance()).SetWindowPortFactory(window_impl_factory);
@@ skipping 47 matching lines @@
   capture_client_.reset();
 
   ui::ShutdownInputMethodForTesting();
 
   if (env_) {
     env_.reset();
   } else if (use_mus_) {
     EnvTestHelper(Env::GetInstance())
         .SetWindowPortFactory(Env::WindowPortFactory());
   }
+  wm_state_.reset();
 }
 
 void AuraTestHelper::RunAllPendingInMessageLoop() {
   // TODO(jbates) crbug.com/134753 Find quitters of this RunLoop and have them
   //              use run_loop.QuitClosure().
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
 }
 
 TestWindowTree* AuraTestHelper::window_tree() {
@@ skipping 16 matching lines @@
                     base::Unretained(this));
 }
 
 std::unique_ptr<WindowPort> AuraTestHelper::CreateWindowPortMus(
     Window* window) {
   return base::MakeUnique<WindowPortMus>(window_tree_client());
 }
 
 }  // namespace test
 }  // namespace aura