Moves couple of WmShell methods to standalone functions

ash/aura/wm_shell_aura.cc

Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index 60f0263827790778d82b1c6f95b8bd6c00cde002..ece50c26e2059bc037ac646b19bdae3a951e8687 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -35,8 +35,6 @@
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/workspace_event_handler_aura.h"
 #include "base/memory/ptr_util.h"
-#include "ui/aura/client/capture_client.h"
-#include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/display/manager/display_manager.h"
 
@@ -79,23 +77,6 @@ Config WmShellAura::GetConfig() const {
   return Config::CLASSIC;
 }
 
-WmWindow* WmShellAura::GetFocusedWindow() {
-  return WmWindow::Get(
-      aura::client::GetFocusClient(Shell::GetPrimaryRootWindow())
-          ->GetFocusedWindow());
-}
-
-WmWindow* WmShellAura::GetActiveWindow() {
-  return WmWindow::Get(wm::GetActiveWindow());
-}
-
-WmWindow* WmShellAura::GetCaptureWindow() {
-  // Ash shares capture client among all RootWindowControllers, so we need only
-  // check the primary root.
-  return WmWindow::Get(
-      aura::client::GetCaptureWindow(Shell::GetPrimaryRootWindow()));
-}
-
 WmWindow* WmShellAura::GetPrimaryRootWindow() {
   return WmWindow::Get(
       Shell::GetInstance()->window_tree_host_manager()->GetPrimaryRootWindow());