Moves WmWindow::GetInternalWidget() into a standalone function

ash/common/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/common/devtools/ash_devtools_css_agent.h"
 #include "ash/common/devtools/ash_devtools_dom_agent.h"
 #include "ash/common/test/ash_test.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
+#include "ash/wm/widget_finder.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"
 
 namespace ash {
 namespace {
 using namespace ui::devtools::protocol;
@@ skipping 52 matching lines @@
   Array<std::string>* attributes = node->getAttributes(nullptr);
   for (size_t i = 0; i < attributes->length() - 1; i++) {
     if (attributes->get(i) == attribute)
       return attributes->get(i + 1);
   }
   return nullptr;
 }
 
 bool Equals(WmWindow* window, DOM::Node* node) {
   int children_count = static_cast<int>(window->GetChildren().size());
-  if (window->GetInternalWidget())
+  if (GetInternalWidgetForWindow(window->aura_window()))
     children_count++;
   return "Window" == node->getNodeName() &&
          window->aura_window()->GetName() == GetAttributeValue("name", node) &&
          children_count == node->getChildNodeCount(kDefaultChildNodeCount);
 }
 
 void Compare(views::Widget* widget, DOM::Node* node) {
   EXPECT_EQ("Widget", node->getNodeName());
   EXPECT_EQ(widget->GetName(), GetAttributeValue("name", node));
   EXPECT_EQ(widget->GetRootView() ? 1 : 0,
@@ skipping 68 matching lines @@
   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);
   EXPECT_TRUE(highlighting_window->IsVisible());
   EXPECT_EQ(bounds, highlighting_window->GetBoundsInScreen());
-  EXPECT_EQ(kBackgroundColor, highlighting_window->GetInternalWidget()
-                                  ->GetRootView()
-                                  ->background()
-                                  ->get_color());
+  EXPECT_EQ(kBackgroundColor,
+            GetInternalWidgetForWindow(highlighting_window->aura_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