Duplicate -Move DevTools out of ash and turn it to a component.

components/ui_devtools/devtools/ui_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/devtools/ui_element.h"
-#include "ash/devtools/window_element.h"
 #include "ash/public/cpp/shell_window_ids.h"
-#include "ash/shell.h"
-#include "ash/test/ash_test_base.h"
-#include "ash/wm/widget_finder.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
+#include "components/ui_devtools/devtools/ui_devtools_css_agent.h"
+#include "components/ui_devtools/devtools/ui_devtools_dom_agent.h"
+#include "components/ui_devtools/devtools/ui_element.h"
+#include "components/ui_devtools/devtools/window_element.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/display/display.h"
 #include "ui/views/background.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
-namespace ash {
+namespace ui {
 namespace {
 
 using namespace ui::devtools::protocol;
 
 const int kDefaultChildNodeCount = -1;
 const SkColor kBackgroundColor = SK_ColorRED;
 const SkColor kBorderColor = SK_ColorBLUE;
 
 class TestView : public views::View {
  public:
@@ skipping 46 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(aura::Window* window, DOM::Node* node) {
   int children_count = static_cast<int>(window->children().size());
-  if (GetInternalWidgetForWindow(window))
+  if (views::Widget::GetWidgetForNativeView(window))
     children_count++;
   return "Window" == node->getNodeName() &&
          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 34 matching lines @@
       EXPECT_TRUE(base::StringToInt(property->getValue(), &value));
       return value;
     }
   }
   NOTREACHED();
   return -1;
 }
 
 aura::Window* GetHighlightingWindow(aura::Window* root_window) {
   const aura::Window::Windows& overlay_windows =
-      root_window->GetChildById(kShellWindowId_OverlayContainer)->children();
+      root_window->GetChildById(ash::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()
@@ skipping 10 matching lines @@
   return DOM::HighlightConfig::create()
       .setContentColor(SkColorToRGBA(background_color))
       .setBorderColor(SkColorToRGBA(border_color))
       .build();
 }
 
 void ExpectHighlighted(const gfx::Rect& bounds, aura::Window* root_window) {
   aura::Window* highlighting_window = GetHighlightingWindow(root_window);
   EXPECT_TRUE(highlighting_window->IsVisible());
   EXPECT_EQ(bounds, highlighting_window->GetBoundsInScreen());
-  EXPECT_EQ(kBackgroundColor, GetInternalWidgetForWindow(highlighting_window)
-                                  ->GetRootView()
-                                  ->background()
-                                  ->get_color());
+  views::Widget* widget =
+      views::Widget::GetWidgetForNativeView(highlighting_window);
+
+  EXPECT_EQ(kBackgroundColor, widget->GetRootView()->background()->get_color());
 }
 
 }  // namespace
 
-class AshDevToolsTest : public test::AshTestBase {
+class UIDevToolsTest : public views::ViewsTestBase {
  public:
-  AshDevToolsTest() {}
-  ~AshDevToolsTest() override {}
+  UIDevToolsTest() {}
+  ~UIDevToolsTest() override {}
 
   views::internal::NativeWidgetPrivate* CreateTestNativeWidget() {
     views::Widget* widget = new views::Widget;
     views::Widget::InitParams params;
     params.ownership = views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET;
     params.parent = nullptr;
     if (!dom_agent()->root_windows().empty()) {
       params.parent = dom_agent()->root_windows()[0]->GetChildById(
-          kShellWindowId_DefaultContainer);
+          ash::kShellWindowId_DefaultContainer);
     }
     widget->Init(params);
     return widget->native_widget_private();
   }
 
-  std::unique_ptr<views::Widget> CreateTestWidget(const gfx::Rect& bounds) {
-    return AshTestBase::CreateTestWidget(nullptr, kShellWindowId_Invalid,
-                                         bounds);
+  std::unique_ptr<views::Widget> CreateTestWidget(
+      const gfx::Rect& bounds,
+      aura::Window* parent = nullptr) {
+    std::unique_ptr<views::Widget> widget(new views::Widget);
+    views::Widget::InitParams params;
+    params.delegate = nullptr;
+    params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+    params.bounds = bounds;
+
+    params.parent = parent;
+    if (!parent && !dom_agent()->root_windows().empty()) {
+      params.parent = dom_agent()->root_windows()[0]->GetChildById(
+          ash::kShellWindowId_Invalid);
+    }
+    widget->Init(params);
+    widget->Show();
+    return widget;
+  }
+
+  std::unique_ptr<aura::Window> CreateChildWindow(
+      aura::Window* parent,
+      int id = ash::kShellWindowId_Invalid,
+      ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL) {
+    std::unique_ptr<aura::Window> window =
+        base::MakeUnique<aura::Window>(nullptr, type);
+    window->Init(ui::LAYER_NOT_DRAWN);
+    window->SetBounds(gfx::Rect());
+    window->set_id(id);
+    parent->AddChild(window.get());
+    window->Show();
+    return window;
   }
 
   void SetUp() override {
     fake_frontend_channel_ = base::MakeUnique<FakeFrontendChannel>();
     uber_dispatcher_ =
         base::MakeUnique<UberDispatcher>(fake_frontend_channel_.get());
-    dom_agent_ = base::MakeUnique<devtools::AshDevToolsDOMAgent>();
+    dom_agent_ = base::MakeUnique<devtools::UIDevToolsDOMAgent>();
     dom_agent_->Init(uber_dispatcher_.get());
     css_agent_ =
-        base::MakeUnique<devtools::AshDevToolsCSSAgent>(dom_agent_.get());
+        base::MakeUnique<devtools::UIDevToolsCSSAgent>(dom_agent_.get());
     css_agent_->Init(uber_dispatcher_.get());
     css_agent_->enable();
-    AshTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
+    top_window = CreateChildWindow(dom_agent()->root_windows()[0]);
+    top_default_container_window = CreateChildWindow(
+        dom_agent()->root_windows()[0], ash::kShellWindowId_DefaultContainer);
+    top_overlay_window = CreateChildWindow(dom_agent()->root_windows()[0],
+                                           ash::kShellWindowId_OverlayContainer,
+                                           ui::wm::WINDOW_TYPE_UNKNOWN);
   }
 
   void TearDown() override {
+    top_overlay_window.reset();
+    top_default_container_window.reset();
+    top_window.reset();
     css_agent_.reset();
     dom_agent_.reset();
     uber_dispatcher_.reset();
     fake_frontend_channel_.reset();
-    AshTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
   void ExpectChildNodeInserted(int parent_id, int prev_sibling_id) {
     EXPECT_EQ(1, frontend_channel()->CountProtocolNotificationMessageStartsWith(
                      base::StringPrintf("{\"method\":\"DOM.childNodeInserted\","
                                         "\"params\":{\"parentNodeId\":%d,"
                                         "\"previousNodeId\":%d",
                                         parent_id, prev_sibling_id)));
   }
 
@@ skipping 51 matching lines @@
     dom_agent_->hideHighlight();
     ASSERT_FALSE(
         GetHighlightingWindow(dom_agent()->root_windows()[root_window_index])
             ->IsVisible());
   }
 
   FakeFrontendChannel* frontend_channel() {
     return fake_frontend_channel_.get();
   }
 
-  devtools::AshDevToolsCSSAgent* css_agent() { return css_agent_.get(); }
-  devtools::AshDevToolsDOMAgent* dom_agent() { return dom_agent_.get(); }
+  devtools::UIDevToolsCSSAgent* css_agent() { return css_agent_.get(); }
+  devtools::UIDevToolsDOMAgent* dom_agent() { return dom_agent_.get(); }
+
+  std::unique_ptr<aura::Window> top_overlay_window;
+  std::unique_ptr<aura::Window> top_window;
+  std::unique_ptr<aura::Window> top_default_container_window;
 
  private:
   std::unique_ptr<UberDispatcher> uber_dispatcher_;
   std::unique_ptr<FakeFrontendChannel> fake_frontend_channel_;
-  std::unique_ptr<devtools::AshDevToolsDOMAgent> dom_agent_;
-  std::unique_ptr<devtools::AshDevToolsCSSAgent> css_agent_;
+  std::unique_ptr<devtools::UIDevToolsDOMAgent> dom_agent_;
+  std::unique_ptr<devtools::UIDevToolsCSSAgent> css_agent_;
 
-  DISALLOW_COPY_AND_ASSIGN(AshDevToolsTest);
+  DISALLOW_COPY_AND_ASSIGN(UIDevToolsTest);
 };
 
-TEST_F(AshDevToolsTest, GetDocumentWithWindowWidgetView) {
+TEST_F(UIDevToolsTest, GetDocumentWithWindowWidgetView) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* parent_window = widget->GetNativeWindow();
   parent_window->SetName("parent_window");
   std::unique_ptr<aura::Window> child_window = CreateChildWindow(parent_window);
   child_window->SetName("child_window");
   widget->Show();
   views::View* child_view = new TestView("child_view");
   widget->GetRootView()->AddChildView(child_view);
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
   ASSERT_TRUE(parent_node);
   Array<DOM::Node>* parent_children = parent_node->getChildren(nullptr);
   ASSERT_TRUE(parent_children);
   DOM::Node* widget_node = parent_children->get(0);
   Compare(widget.get(), widget_node);
   Compare(child_window.get(), parent_children->get(1));
   Array<DOM::Node>* widget_children = widget_node->getChildren(nullptr);
   ASSERT_TRUE(widget_children);
   Compare(widget->GetRootView(), widget_children->get(0));
   ASSERT_TRUE(widget_children->get(0)->getChildren(nullptr));
   Compare(child_view, widget_children->get(0)->getChildren(nullptr)->get(1));
 }
 
-TEST_F(AshDevToolsTest, GetDocumentNativeWidgetOwnsWidget) {
+TEST_F(UIDevToolsTest, GetDocumentNativeWidgetOwnsWidget) {
   views::internal::NativeWidgetPrivate* native_widget_private =
       CreateTestNativeWidget();
   views::Widget* widget = native_widget_private->GetWidget();
   aura::Window* parent_window = widget->GetNativeWindow();
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
   ASSERT_TRUE(parent_node);
   DOM::Node* widget_node = parent_node->getChildren(nullptr)->get(0);
   Compare(widget, widget_node);
   // Destroy NativeWidget followed by |widget|
   widget->CloseNow();
 }
 
-TEST_F(AshDevToolsTest, WindowAddedChildNodeInserted) {
+TEST_F(UIDevToolsTest, WindowAddedChildNodeInserted) {
   // Initialize DOMAgent
+  std::unique_ptr<aura::Window> top_invalid_window_child =
+      CreateChildWindow(top_window.get());
+
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
-
   aura::Window* root_window = dom_agent()->root_windows()[0];
   aura::Window* parent_window = root_window->children()[0];
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
   Array<DOM::Node>* parent_node_children = parent_node->getChildren(nullptr);
   DOM::Node* sibling_node =
       parent_node_children->get(parent_node_children->length() - 1);
 
   std::unique_ptr<aura::Window> child(CreateChildWindow(parent_window));
   ExpectChildNodeInserted(parent_node->getNodeId(), sibling_node->getNodeId());
+  top_invalid_window_child.reset();
 }
 
-TEST_F(AshDevToolsTest, WindowDestroyedChildNodeRemoved) {
+TEST_F(UIDevToolsTest, WindowDestroyedChildNodeRemoved) {
+  std::unique_ptr<aura::Window> child_1 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_2 = CreateChildWindow(child_1.get());
+
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   aura::Window* root_window = dom_agent()->root_windows()[0];
   aura::Window* rotation_window = root_window->children()[0];
   aura::Window* parent_window = rotation_window->children()[0];
   aura::Window* child_window = parent_window->children()[0];
   DOM::Node* root_node =
       root->getChildren(nullptr)->get(0)->getChildren(nullptr)->get(0);
   DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
   DOM::Node* child_node = parent_node->getChildren(nullptr)->get(0);
 
   Compare(parent_window, parent_node);
   Compare(child_window, child_node);
-  delete child_window;
+  child_2.reset();
   ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
+  child_1.reset();
 }
 
-TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRearranged) {
+TEST_F(UIDevToolsTest, WindowReorganizedChildNodeRearranged) {
+  std::unique_ptr<aura::Window> child_1 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_2 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_11 = CreateChildWindow(child_1.get());
+  std::unique_ptr<aura::Window> child_21 = CreateChildWindow(child_2.get());
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
-
   aura::Window* root_window = dom_agent()->root_windows()[0];
   aura::Window* rotation_window = root_window->children()[0];
   aura::Window* parent_window = rotation_window->children()[0];
   aura::Window* target_window = rotation_window->children()[1];
   aura::Window* child_window = parent_window->children()[0];
 
   DOM::Node* root_node =
       root->getChildren(nullptr)->get(0)->getChildren(nullptr)->get(0);
   DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
   DOM::Node* target_node = root_node->getChildren(nullptr)->get(1);
   Array<DOM::Node>* target_node_children = target_node->getChildren(nullptr);
   DOM::Node* sibling_node =
       target_node_children->get(target_node_children->length() - 1);
   DOM::Node* child_node = parent_node->getChildren(nullptr)->get(0);
 
   Compare(parent_window, parent_node);
   Compare(target_window, target_node);
   Compare(child_window, child_node);
   target_window->AddChild(child_window);
   ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
   ExpectChildNodeInserted(target_node->getNodeId(), sibling_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, WindowReorganizedChildNodeRemovedAndInserted) {
+TEST_F(UIDevToolsTest, WindowReorganizedChildNodeRemovedAndInserted) {
+  std::unique_ptr<aura::Window> child_1 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_2 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_21 = CreateChildWindow(child_2.get());
+  std::unique_ptr<aura::Window> child_22 = CreateChildWindow(child_2.get());
+
   aura::Window* root_window = dom_agent()->root_windows()[0];
   aura::Window* rotation_window = root_window->children()[0];
   aura::Window* parent_window = rotation_window->children()[0];
   aura::Window* target_window = rotation_window->children()[1];
   std::unique_ptr<aura::Window> child_window(CreateChildWindow(parent_window));
 
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
   DOM::Node* root_node =
       root->getChildren(nullptr)->get(0)->getChildren(nullptr)->get(0);
   DOM::Node* parent_node = root_node->getChildren(nullptr)->get(0);
   DOM::Node* target_node = root_node->getChildren(nullptr)->get(1);
   Array<DOM::Node>* target_node_children = target_node->getChildren(nullptr);
   DOM::Node* sibling_node =
       target_node_children->get(target_node_children->length() - 1);
   Array<DOM::Node>* parent_node_children = parent_node->getChildren(nullptr);
   DOM::Node* child_node =
       parent_node_children->get(parent_node_children->length() - 1);
 
   Compare(parent_window, parent_node);
   Compare(target_window, target_node);
   Compare(child_window.get(), child_node);
   parent_window->RemoveChild(child_window.get());
   target_window->AddChild(child_window.get());
   ExpectChildNodeRemoved(parent_node->getNodeId(), child_node->getNodeId());
   ExpectChildNodeInserted(target_node->getNodeId(), sibling_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, WindowStackingChangedChildNodeRemovedAndInserted) {
+TEST_F(UIDevToolsTest, WindowStackingChangedChildNodeRemovedAndInserted) {
+  std::unique_ptr<aura::Window> child_11 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_12 = CreateChildWindow(top_window.get());
+  std::unique_ptr<aura::Window> child_13 = CreateChildWindow(top_window.get());
+
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   aura::Window* root_window = dom_agent()->root_windows()[0];
   aura::Window* parent_window = root_window->children()[0];
   aura::Window* child_window = parent_window->children()[0];
   aura::Window* target_window = parent_window->children()[1];
 
   DOM::Node* parent_node =
       root->getChildren(nullptr)->get(0)->getChildren(nullptr)->get(0);
   Array<DOM::Node>* parent_node_children = parent_node->getChildren(nullptr);
   DOM::Node* child_node = parent_node_children->get(0);
   DOM::Node* sibling_node = parent_node_children->get(1);
   int parent_id = parent_node->getNodeId();
 
   Compare(parent_window, parent_node);
   Compare(child_window, child_node);
   parent_window->StackChildAbove(child_window, target_window);
   ExpectChildNodeRemoved(parent_id, child_node->getNodeId());
   ExpectChildNodeInserted(parent_id, sibling_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, ViewInserted) {
+TEST_F(UIDevToolsTest, ViewInserted) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* window = widget->GetNativeWindow();
   widget->Show();
 
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(window, root.get());
   ASSERT_TRUE(parent_node);
   DOM::Node* widget_node = parent_node->getChildren(nullptr)->get(0);
   DOM::Node* root_view_node = widget_node->getChildren(nullptr)->get(0);
   Array<DOM::Node>* root_view_children = root_view_node->getChildren(nullptr);
   ASSERT_TRUE(root_view_children);
   DOM::Node* sibling_view_node =
       root_view_children->get(root_view_children->length() - 1);
 
   widget->GetRootView()->AddChildView(new views::View);
   ExpectChildNodeInserted(root_view_node->getNodeId(),
                           sibling_view_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, ViewRemoved) {
+TEST_F(UIDevToolsTest, ViewRemoved) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   // Need to store |view| in unique_ptr because it is removed from the widget
   // and needs to be destroyed independently
   std::unique_ptr<views::View> child_view = base::MakeUnique<views::View>();
   aura::Window* window = widget->GetNativeWindow();
   widget->Show();
   views::View* root_view = widget->GetRootView();
   root_view->AddChildView(child_view.get());
 
   // Initialize DOMAgent
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(window, root.get());
   ASSERT_TRUE(parent_node);
   DOM::Node* widget_node = parent_node->getChildren(nullptr)->get(0);
   DOM::Node* root_view_node = widget_node->getChildren(nullptr)->get(0);
   Array<DOM::Node>* root_view_children = root_view_node->getChildren(nullptr);
   ASSERT_TRUE(root_view_children);
   DOM::Node* child_view_node =
       root_view_children->get(root_view_children->length() - 1);
 
   Compare(child_view.get(), child_view_node);
   root_view->RemoveChildView(child_view.get());
   ExpectChildNodeRemoved(root_view_node->getNodeId(),
                          child_view_node->getNodeId());
 }
 
-TEST_F(AshDevToolsTest, ViewRearranged) {
+TEST_F(UIDevToolsTest, ViewRearranged) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* window = widget->GetNativeWindow();
   widget->Show();
   views::View* root_view = widget->GetRootView();
   views::View* parent_view = new views::View;
   views::View* target_view = new views::View;
   views::View* child_view = new views::View;
   views::View* child_view_1 = new views::View;
 
@@ skipping 32 matching lines @@
   ExpectChildNodeRemoved(parent_view_node->getNodeId(),
                          child_view_node_1->getNodeId());
   ExpectChildNodeInserted(parent_view_node->getNodeId(), 0);
 
   target_view->AddChildView(child_view);
   ExpectChildNodeRemoved(parent_view_node->getNodeId(),
                          child_view_node->getNodeId());
   ExpectChildNodeInserted(target_view_node->getNodeId(), 0);
 }
 
-TEST_F(AshDevToolsTest, ViewRearrangedRemovedAndInserted) {
+TEST_F(UIDevToolsTest, ViewRearrangedRemovedAndInserted) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* window = widget->GetNativeWindow();
   widget->Show();
   views::View* root_view = widget->GetRootView();
   views::View* parent_view = new views::View;
   views::View* target_view = new views::View;
   views::View* child_view = new views::View;
   root_view->AddChildView(parent_view);
   root_view->AddChildView(target_view);
@@ skipping 18 matching lines @@
   Compare(parent_view, parent_view_node);
   Compare(target_view, target_view_node);
   Compare(child_view, child_view_node);
   parent_view->RemoveChildView(child_view);
   target_view->AddChildView(child_view);
   ExpectChildNodeRemoved(parent_view_node->getNodeId(),
                          child_view_node->getNodeId());
   ExpectChildNodeInserted(target_view_node->getNodeId(), 0);
 }
 
-TEST_F(AshDevToolsTest, WindowWidgetViewHighlight) {
+TEST_F(UIDevToolsTest, WindowWidgetViewHighlight) {
+  DCHECK_EQ(dom_agent()->root_windows()[0]->GetChildById(
+                ash::kShellWindowId_OverlayContainer),
+            top_overlay_window.get());
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(0, 0, 400, 400)));
   aura::Window* parent_window = widget->GetNativeWindow();
   std::unique_ptr<aura::Window> window(CreateChildWindow(parent_window));
   views::View* root_view = widget->GetRootView();
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
@@ skipping 38 matching lines @@
   for (auto* child : ui_element->children()) {
     if (child->type() == devtools::UIElementType::WINDOW) {
       int node_id = GetNodeIdFromWindow(child, window);
       if (node_id > 0)
         return node_id;
     }
   }
   return 0;
 }
 
-TEST_F(AshDevToolsTest, MultipleDisplayHighlight) {
-  UpdateDisplay("300x400,500x500");
+// TODO(thanhph): Add UIDevToolsTest.MultipleDisplayHighlight back when multiple
+// displays are available for ViewTestBase.
 
-  aura::Window::Windows root_windows = dom_agent()->root_windows();
-  std::unique_ptr<aura::Window> window(
-      CreateTestWindowInShellWithBounds(gfx::Rect(1, 2, 30, 40)));
-
-  std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
-  dom_agent()->getDocument(&root);
-
-  EXPECT_EQ(root_windows[0], window->GetRootWindow());
-  HighlightNode(
-      GetNodeIdFromWindow(dom_agent()->window_element_root(), window.get()));
-  ExpectHighlighted(window->GetBoundsInScreen(),
-                    dom_agent()->root_windows()[0]);
-
-  window->SetBoundsInScreen(gfx::Rect(500, 0, 50, 50), GetSecondaryDisplay());
-  EXPECT_EQ(root_windows[1], window->GetRootWindow());
-  HighlightNode(
-      GetNodeIdFromWindow(dom_agent()->window_element_root(), window.get()));
-  ExpectHighlighted(window->GetBoundsInScreen(),
-                    dom_agent()->root_windows()[1]);
-}
-
-TEST_F(AshDevToolsTest, WindowWidgetViewGetMatchedStylesForNode) {
+TEST_F(UIDevToolsTest, WindowWidgetViewGetMatchedStylesForNode) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* parent_window = widget->GetNativeWindow();
   std::unique_ptr<aura::Window> window(CreateChildWindow(parent_window));
   gfx::Rect window_bounds(2, 2, 3, 3);
   gfx::Rect widget_bounds(50, 50, 100, 75);
   gfx::Rect view_bounds(4, 4, 3, 3);
   window->SetBounds(window_bounds);
   widget->SetBounds(widget_bounds);
   widget->GetRootView()->SetBoundsRect(view_bounds);
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
   ASSERT_TRUE(parent_node);
   Array<DOM::Node>* parent_children = parent_node->getChildren(nullptr);
   ASSERT_TRUE(parent_children);
 
   CompareNodeBounds(parent_node, widget_bounds);
   CompareNodeBounds(parent_children->get(1), window_bounds);
   CompareNodeBounds(parent_children->get(0)->getChildren(nullptr)->get(0),
                     view_bounds);
 }
 
-TEST_F(AshDevToolsTest, WindowWidgetViewStyleSheetChanged) {
+TEST_F(UIDevToolsTest, WindowWidgetViewStyleSheetChanged) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
   aura::Window* widget_window = widget->GetNativeWindow();
   std::unique_ptr<aura::Window> child(CreateChildWindow(widget_window));
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   gfx::Rect child_bounds(2, 2, 3, 3);
   gfx::Rect widget_bounds(10, 10, 150, 160);
   gfx::Rect view_bounds(4, 4, 3, 3);
   child->SetBounds(child_bounds);
   widget->SetBounds(widget_bounds);
   widget->GetRootView()->SetBoundsRect(view_bounds);
 
   DOM::Node* widget_node = FindInRoot(widget_window, root.get());
   ASSERT_TRUE(widget_node);
   Array<DOM::Node>* widget_node_children = widget_node->getChildren(nullptr);
   ASSERT_TRUE(widget_node_children);
 
   EXPECT_EQ(1, GetStyleSheetChangedCount(widget_node->getNodeId()));
   EXPECT_EQ(
       1, GetStyleSheetChangedCount(widget_node_children->get(1)->getNodeId()));
-  EXPECT_EQ(2,
-            GetStyleSheetChangedCount(widget_node_children->get(0)
-                                          ->getChildren(nullptr)
-                                          ->get(0)
-                                          ->getNodeId()));
+  EXPECT_EQ(2, GetStyleSheetChangedCount(widget_node_children->get(0)
+                                             ->getChildren(nullptr)
+                                             ->get(0)
+                                             ->getNodeId()));
 }
 
-TEST_F(AshDevToolsTest, WindowWidgetViewSetStyleText) {
+TEST_F(UIDevToolsTest, WindowWidgetViewSetStyleText) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(0, 0, 400, 400)));
   aura::Window* parent_window = widget->GetNativeWindow();
   std::unique_ptr<aura::Window> window(CreateChildWindow(parent_window));
   views::View* root_view = widget->GetRootView();
 
   std::unique_ptr<ui::devtools::protocol::DOM::Node> root;
   dom_agent()->getDocument(&root);
 
   DOM::Node* parent_node = FindInRoot(parent_window, root.get());
@@ skipping 51 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
+}  // namespace ui