Change FocusSynchronizer to maintain active focus client and window.

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/focus_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"
 #include "ui/views/widget/widget_observer.h"
@@ skipping 175 matching lines @@
   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());
+  EXPECT_EQ(widget_focus_client, MusClient::Get()
+                                     ->window_tree_client()
+                                     ->focus_synchronizer()
+                                     ->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());
 
@@ skipping 96 matching lines @@
   params.shadow_type = Widget::InitParams::SHADOW_TYPE_NONE;
   widget.Init(params);
   EXPECT_EQ(wm::ShadowElevation::NONE,
             widget.GetNativeView()->GetProperty(wm::kShadowElevationKey));
   EXPECT_EQ(wm::ShadowElevation::NONE,
             widget.GetNativeView()->GetHost()->window()->GetProperty(
                 wm::kShadowElevationKey));
 }
 
 }  // namespace views