Removes a couple more functions from WmWindow

ash/devtools/ash_devtools_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 "ash/devtools/ash_devtools_css_agent.h"
 #include "ash/devtools/ash_devtools_dom_agent.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/test/ash_test.h"
 #include "ash/wm/widget_finder.h"
 #include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/display.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
@@ skipping 109 matching lines @@
     if (property->getName() == name) {
       int value;
       EXPECT_TRUE(base::StringToInt(property->getValue(), &value));
       return value;
     }
   }
   NOTREACHED();
   return -1;
 }
 
-WmWindow* GetHighlightingWindow(int root_window_index) {
-  WmWindow::Windows overlay_windows =
-      ShellPort::Get()
-          ->GetAllRootWindows()[root_window_index]
-          ->GetChildByShellWindowId(kShellWindowId_OverlayContainer)
-          ->GetChildren();
-  for (WmWindow* window : overlay_windows) {
-    if (window->aura_window()->GetName() == "HighlightingWidget")
+aura::Window* GetHighlightingWindow(int root_window_index) {
+  const aura::Window::Windows& overlay_windows =
+      Shell::GetAllRootWindows()[root_window_index]
+          ->GetChildById(kShellWindowId_OverlayContainer)
+          ->children();
+  for (aura::Window* window : overlay_windows) {
+    if (window->GetName() == "HighlightingWidget")
       return window;
   }
   NOTREACHED();
   return nullptr;
 }
 
 std::unique_ptr<DOM::RGBA> SkColorToRGBA(const SkColor& color) {
   return DOM::RGBA::create()
       .setA(SkColorGetA(color) / 255)
       .setB(SkColorGetB(color))
       .setG(SkColorGetG(color))
       .setR(SkColorGetR(color))
       .build();
 }
 
 std::unique_ptr<DOM::HighlightConfig> CreateHighlightConfig(
     const SkColor& background_color,
     const SkColor& border_color) {
   return DOM::HighlightConfig::create()
       .setContentColor(SkColorToRGBA(background_color))
       .setBorderColor(SkColorToRGBA(border_color))
       .build();
 }
 
 void ExpectHighlighted(const gfx::Rect& bounds, int root_window_index) {
-  WmWindow* highlighting_window = GetHighlightingWindow(root_window_index);
+  aura::Window* highlighting_window = GetHighlightingWindow(root_window_index);
   EXPECT_TRUE(highlighting_window->IsVisible());
   EXPECT_EQ(bounds, highlighting_window->GetBoundsInScreen());
-  EXPECT_EQ(kBackgroundColor,
-            GetInternalWidgetForWindow(highlighting_window->aura_window())
-                ->GetRootView()
-                ->background()
-                ->get_color());
+  EXPECT_EQ(kBackgroundColor, GetInternalWidgetForWindow(highlighting_window)
+                                  ->GetRootView()
+                                  ->background()
+                                  ->get_color());
 }
 
 }  // namespace
 
 class AshDevToolsTest : public AshTest {
  public:
   AshDevToolsTest() {}
   ~AshDevToolsTest() override {}
 
   views::internal::NativeWidgetPrivate* CreateTestNativeWidget() {
@@ skipping 579 matching lines @@
   SetStyleTexts(root_view_node, "\nheight: 73;\n  ", true);
   EXPECT_EQ(gfx::Rect(25, 35, 45, 73), root_view->bounds());
 
   SetStyleTexts(root_view_node, "\nx: 10; y: 23; width: 52;\nvisibility: 1;\n",
                 true);
   EXPECT_EQ(gfx::Rect(10, 23, 52, 73), root_view->bounds());
   EXPECT_TRUE(root_view->visible());
 }
 
 }  // namespace ash