Componentize Constrained Window Views

components/constrained_window/constrained_window_views_unittest.cc

 // Copyright 2013 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 "chrome/browser/ui/views/constrained_window_views.h"
+#include "components/constrained_window/constrained_window_views.h"
 
 #include "components/web_modal/test_web_contents_modal_dialog_host.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/border.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
@@ skipping 67 matching lines @@
   DialogContents* contents_;
   scoped_ptr<web_modal::TestWebContentsModalDialogHost> dialog_host_;
   scoped_ptr<Widget> dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(ConstrainedWindowViewsTest);
 };
 
 // Make sure a dialog that increases its preferred size grows on the next
 // position update.
 TEST_F(ConstrainedWindowViewsTest, GrowModalDialogSize) {
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   gfx::Size expected_size = GetDialogSize();
   gfx::Size preferred_size = contents()->GetPreferredSize();
   expected_size.Enlarge(50, 50);
   preferred_size.Enlarge(50, 50);
   contents()->set_preferred_size(preferred_size);
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   EXPECT_EQ(expected_size.ToString(), GetDialogSize().ToString());
 }
 
 // Make sure a dialog that reduces its preferred size shrinks on the next
 // position update.
 TEST_F(ConstrainedWindowViewsTest, ShrinkModalDialogSize) {
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   gfx::Size expected_size = GetDialogSize();
   gfx::Size preferred_size = contents()->GetPreferredSize();
   expected_size.Enlarge(-50, -50);
   preferred_size.Enlarge(-50, -50);
   contents()->set_preferred_size(preferred_size);
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   EXPECT_EQ(expected_size.ToString(), GetDialogSize().ToString());
 }
 
 // Make sure browser modal dialogs are not affected by restrictions on web
 // content modal dialog maximum sizes.
 TEST_F(ConstrainedWindowViewsTest, MaximumBrowserDialogSize) {
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   gfx::Size dialog_size = GetDialogSize();
   gfx::Size max_dialog_size = dialog_size;
   max_dialog_size.Enlarge(-50, -50);
   dialog_host()->set_max_dialog_size(max_dialog_size);
-  UpdateBrowserModalDialogPosition(dialog(), dialog_host());
+  UpdateWidgetModalDialogPosition(dialog(), dialog_host());
   EXPECT_EQ(dialog_size.ToString(), GetDialogSize().ToString());
 }
 
 // Web content modal dialogs should not get a size larger than what the dialog
 // host gives as the maximum size.
 TEST_F(ConstrainedWindowViewsTest, MaximumWebContentsDialogSize) {
   UpdateWebContentsModalDialogPosition(dialog(), dialog_host());
   gfx::Size full_dialog_size = GetDialogSize();
   gfx::Size max_dialog_size = full_dialog_size;
   max_dialog_size.Enlarge(-50, -50);
@@ skipping 10 matching lines @@
 
   // Increasing the maximum dialog size should bring the dialog back to its
   // original size.
   max_dialog_size.Enlarge(100, 100);
   dialog_host()->set_max_dialog_size(max_dialog_size);
   UpdateWebContentsModalDialogPosition(dialog(), dialog_host());
   EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString());
 }
 
 }  // namespace views