Revert of Converts chrome to aura-mus

chrome/browser/ui/views/frame/immersive_context_mus.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 "chrome/browser/ui/views/frame/immersive_context_mus.h"
 
-#include "ui/aura/client/capture_client.h"
-#include "ui/views/mus/mus_client.h"
-#include "ui/views/mus/pointer_watcher_event_router2.h"
+#include "services/ui/public/cpp/window_tree_client.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
+#include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/pointer_watcher.h"
 
-ImmersiveContextMus::ImmersiveContextMus(
-    aura::client::CaptureClient* capture_client)
-    : capture_client_(capture_client) {}
+ImmersiveContextMus::ImmersiveContextMus() {}
 
 ImmersiveContextMus::~ImmersiveContextMus() {}
 
 void ImmersiveContextMus::InstallResizeHandleWindowTargeter(
     ash::ImmersiveFullscreenController* controller) {
   // There shouldn't be a need to do anything here, the windowmanager takes care
   // of this for us.
 }
 
 void ImmersiveContextMus::OnEnteringOrExitingImmersive(
     ash::ImmersiveFullscreenController* controller,
     bool entering) {
   // TODO: see implementation in ImmersiveContextAsh, this needs to use mojo
   // to poke some state in mash (shelf model, in immersive, shelf
   // visibility...).
   // http://crbug.com/640371.
   NOTIMPLEMENTED();
 }
 
 gfx::Rect ImmersiveContextMus::GetDisplayBoundsInScreen(views::Widget* widget) {
   return widget->GetWindowBoundsInScreen();
 }
 
 void ImmersiveContextMus::AddPointerWatcher(
     views::PointerWatcher* watcher,
     views::PointerWatcherEventTypes events) {
   // TODO: http://crbug.com/641164
-  views::MusClient::Get()->pointer_watcher_event_router()->AddPointerWatcher(
-      watcher, events == views::PointerWatcherEventTypes::MOVES);
+  views::WindowManagerConnection::Get()
+      ->pointer_watcher_event_router()
+      ->AddPointerWatcher(watcher,
+                          events == views::PointerWatcherEventTypes::MOVES);
 }
 
 void ImmersiveContextMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
-  views::MusClient::Get()->pointer_watcher_event_router()->RemovePointerWatcher(
-      watcher);
+  views::WindowManagerConnection::Get()
+      ->pointer_watcher_event_router()
+      ->RemovePointerWatcher(watcher);
 }
 
 bool ImmersiveContextMus::DoesAnyWindowHaveCapture() {
-  return capture_client_->GetGlobalCaptureWindow() != nullptr;
+  return views::WindowManagerConnection::Get()->client()->GetCaptureWindow() !=
+         nullptr;
 }
 
 bool ImmersiveContextMus::IsMouseEventsEnabled() {
   // TODO: http://crbug.com/640374.
   NOTIMPLEMENTED();
   return true;
 }