Revert of MacViews: Fix WebDialogBrowserTest.SizeWindow to get browser_tests compiling on MacViews

chrome/browser/ui/views/web_dialog_view_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 66 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWebDialogView);
 };
 
 }  // namespace
 
 class WebDialogBrowserTest : public InProcessBrowserTest {
  public:
   WebDialogBrowserTest() {}
 };
 
-// Windows has some issues resizing windows. An off by one problem, and a
-// minimum size that seems too big. See http://crbug.com/52602.
-#if defined(OS_WIN)
-#define MAYBE_SizeWindow DISABLED_SizeWindow
-#else
-#define MAYBE_SizeWindow SizeWindow
-#endif
-IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) {
+// http://code.google.com/p/chromium/issues/detail?id=52602
+// Windows has some issues resizing windows- an off by one problem,
+// and a minimum size that seems too big.  This file isn't included in
+// Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS
+// doesn't allow resizing of windows.
+IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, DISABLED_SizeWindow) {
   ui::test::TestWebDialogDelegate* delegate =
       new ui::test::TestWebDialogDelegate(
           GURL(chrome::kChromeUIChromeURLsURL));
   delegate->set_size(kInitialWidth, kInitialHeight);
 
   TestWebDialogView* view =
       new TestWebDialogView(browser()->profile(), delegate);
   WebContents* web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(web_contents != NULL);
-  views::Widget::CreateWindowWithParent(view, web_contents->GetNativeView());
+  views::Widget::CreateWindowWithParent(
+      view, web_contents->GetTopLevelNativeWindow());
   view->GetWidget()->Show();
 
   // TestWebDialogView should quit current message loop on size change.
   view->set_should_quit_on_size_change(true);
 
   gfx::Rect bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
 
   gfx::Rect set_bounds = bounds;
   gfx::Rect actual_bounds, rwhv_bounds;
 
@@ skipping 23 matching lines @@
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
   // Get very small.
-  const gfx::Size min_size = view->GetWidget()->GetMinimumSize();
-  EXPECT_LT(0, min_size.width());
-  EXPECT_LT(0, min_size.height());
-
+  gfx::Size min_size = view->GetWidget()->GetMinimumSize();
   set_bounds.set_size(min_size);
 
   view->MoveContents(web_contents, set_bounds);
   content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
   EXPECT_LT(0, rwhv_bounds.width());
   EXPECT_LT(0, rwhv_bounds.height());
   EXPECT_GE(set_bounds.width(), rwhv_bounds.width());
   EXPECT_GE(set_bounds.height(), rwhv_bounds.height());
 
-  // Check to make sure we can't get to 0x0. First expand beyond the minimum
-  // size that was set above so that TestWebDialogView has a change to pick up.
-  set_bounds.set_height(250);
-  view->MoveContents(web_contents, set_bounds);
-  content::RunMessageLoop();  // TestWebDialogView will quit.
-  actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
-  EXPECT_EQ(set_bounds, actual_bounds);
-
-  // Now verify that attempts to re-size to 0x0 enforces the minimum size.
+  // Check to make sure we can't get to 0x0
   set_bounds.set_width(0);
   set_bounds.set_height(0);
 
   view->MoveContents(web_contents, set_bounds);
   content::RunMessageLoop();  // TestWebDialogView will quit.
   actual_bounds = view->GetWidget()->GetClientAreaBoundsInScreen();
-  EXPECT_EQ(min_size, actual_bounds.size());
-
-  // And that the render view is also non-zero.
-  rwhv_bounds =
-      view->web_contents()->GetRenderWidgetHostView()->GetViewBounds();
-  EXPECT_LT(0, rwhv_bounds.width());
-  EXPECT_LT(0, rwhv_bounds.height());
+  EXPECT_LT(0, actual_bounds.width());
+  EXPECT_LT(0, actual_bounds.height());
 }