Remove WmLookup.

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_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.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 273 matching lines @@
   std::unique_ptr<FakeFrontendChannel> fake_frontend_channel_;
   std::unique_ptr<devtools::AshDevToolsDOMAgent> dom_agent_;
   std::unique_ptr<devtools::AshDevToolsCSSAgent> css_agent_;
 
   DISALLOW_COPY_AND_ASSIGN(AshDevToolsTest);
 };
 
 TEST_F(AshDevToolsTest, GetDocumentWithWindowWidgetView) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* parent_window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* parent_window = WmWindow::Get(widget.get()->GetNativeWindow());

[sky, 2017/03/02 19:04:52]

Remove the .get() in all these, e.g. widget->GetNativeWindow().

[thanhph1, 2017/03/02 22:24:17]

Thanks Scott, I double-checked and removed all of .get(). I can split this code
into 2 patches if you find it easier to review.

Thanks,
Thanh.

   parent_window->SetName("parent_window");
   std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
   WmWindow* child_window = child_owner->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, 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) {
   views::internal::NativeWidgetPrivate* native_widget_private =
       CreateTestNativeWidget();
   views::Widget* widget = native_widget_private->GetWidget();
-  WmWindow* parent_window = WmLookup::Get()->GetWindowForWidget(widget);
+  WmWindow* parent_window = WmWindow::Get(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();
@@ skipping 103 matching lines @@
   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) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* window = WmWindow::Get(widget.get()->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) {
   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>();
-  WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* window = WmWindow::Get(widget.get()->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) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* window = WmWindow::Get(widget.get()->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);
   parent_view->AddChildView(child_view);
 
   // Initialize DOMAgent
@@ skipping 17 matching lines @@
   Compare(child_view, child_view_node);
   target_view->AddChildView(child_view);
   ExpectChildNodeRemoved(parent_view_node->getNodeId(),
                          child_view_node->getNodeId());
   ExpectChildNodeInserted(target_view_node->getNodeId(), 0);
 }
 
 TEST_F(AshDevToolsTest, ViewRearrangedRemovedAndInserted) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* window = WmWindow::Get(widget.get()->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);
   parent_view->AddChildView(child_view);
 
   // Initialize DOMAgent
@@ skipping 18 matching lines @@
   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) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(0, 0, 400, 400)));
-  WmWindow* parent_window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* parent_window = WmWindow::Get(widget.get()->GetNativeWindow());
   std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
   WmWindow* window = child_owner->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());
   ASSERT_TRUE(parent_node);
   Array<DOM::Node>* parent_children = parent_node->getChildren(nullptr);
@@ skipping 39 matching lines @@
 
   window->SetBoundsInScreen(gfx::Rect(500, 0, 50, 50), GetSecondaryDisplay());
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   HighlightNode(dom_agent()->GetNodeIdFromWindow(window));
   ExpectHighlighted(window->GetBoundsInScreen(), 1);
 }
 
 TEST_F(AshDevToolsTest, WindowWidgetViewGetMatchedStylesForNode) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* parent_window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* parent_window = WmWindow::Get(widget.get()->GetNativeWindow());
   std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
   WmWindow* window = child_owner->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) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(1, 1, 1, 1)));
-  WmWindow* widget_window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* widget_window = WmWindow::Get(widget.get()->GetNativeWindow());
   std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(widget_window));
   WmWindow* child = child_owner->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);
@@ skipping 11 matching lines @@
   EXPECT_EQ(2,
             GetStyleSheetChangedCount(widget_node_children->get(0)
                                           ->getChildren(nullptr)
                                           ->get(0)
                                           ->getNodeId()));
 }
 
 TEST_F(AshDevToolsTest, WindowWidgetViewSetStyleText) {
   std::unique_ptr<views::Widget> widget(
       CreateTestWidget(gfx::Rect(0, 0, 400, 400)));
-  WmWindow* parent_window = WmLookup::Get()->GetWindowForWidget(widget.get());
+  WmWindow* parent_window = WmWindow::Get(widget.get()->GetNativeWindow());
   std::unique_ptr<WindowOwner> child_owner(CreateChildWindow(parent_window));
   WmWindow* window = child_owner->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());
   ASSERT_TRUE(parent_node);
   Array<DOM::Node>* parent_children = parent_node->getChildren(nullptr);
@@ skipping 40 matching lines @@
   EXPECT_EQ(gfx::Rect(25, 35, 45, 20), root_view->bounds());  // Not changed
 
   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;\n  ", true);
   EXPECT_EQ(gfx::Rect(10, 23, 52, 73), root_view->bounds());
 }
 
 }  // namespace ash