Cleanup popup related browser navigation code.

chrome/browser/ui/browser_navigator_browsertest.cc

 // Copyright (c) 2011 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/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 226 matching lines @@
   EXPECT_EQ(1, popup->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
   EXPECT_EQ(Browser::TYPE_NORMAL, p.browser->type());
 }
 
 // This test verifies that navigating with WindowOpenDisposition = NEW_POPUP
 // from a normal Browser results in a new Browser with TYPE_POPUP.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopup) {
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = NEW_POPUP;
+  p.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p);
   // Wait for new popup to to load and gain focus.
   ui_test_utils::WaitForNavigationInCurrentTab(p.browser);
 
   // Navigate() should have opened a new, focused popup window.
   EXPECT_NE(browser(), p.browser);
 #if 0
   // TODO(stevenjb): Enable this test. See: crbug.com/79493
   EXPECT_TRUE(p.browser->window()->IsActive());
 #endif
   EXPECT_EQ(Browser::TYPE_POPUP, p.browser->type());
 
   // We should have two windows, the browser() provided by the framework and the
   // new popup window.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
 }
 
 // This test verifies that navigating with WindowOpenDisposition = NEW_POPUP
 // from a normal popup results in a new Browser with TYPE_POPUP.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupFromPopup) {
   // Open a popup.
   browser::NavigateParams p1(MakeNavigateParams());
   p1.disposition = NEW_POPUP;
+  p1.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p1);
   // Open another popup.
   browser::NavigateParams p2(MakeNavigateParams(p1.browser));
   p2.disposition = NEW_POPUP;
+  p2.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p2);
 
   // Navigate() should have opened a new normal popup window.
   EXPECT_NE(p1.browser, p2.browser);
   EXPECT_EQ(Browser::TYPE_POPUP, p2.browser->type());
 
   // We should have three windows, the browser() provided by the framework,
   // the first popup window, and the second popup window.
   EXPECT_EQ(3u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, p1.browser->tab_count());
   EXPECT_EQ(1, p2.browser->tab_count());
 }
 
 // This test verifies that navigating with WindowOpenDisposition = NEW_POPUP
 // from an app frame results in a new Browser with TYPE_APP_POPUP.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_NewPopupFromAppWindow) {
   Browser* app_browser = CreateEmptyBrowserForType(Browser::TYPE_APP,
                                                    browser()->profile());
   browser::NavigateParams p(MakeNavigateParams(app_browser));
   p.disposition = NEW_POPUP;
+  p.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p);
 
   // Navigate() should have opened a new popup app window.
   EXPECT_NE(app_browser, p.browser);
   EXPECT_NE(browser(), p.browser);
   EXPECT_EQ(Browser::TYPE_APP_POPUP, p.browser->type());
 
   // We should now have three windows, the app window, the app popup it created,
   // and the original browser() provided by the framework.
   EXPECT_EQ(3u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, app_browser->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
 }
 
 // This test verifies that navigating with WindowOpenDisposition = NEW_POPUP
 // from an app popup results in a new Browser also of TYPE_APP_POPUP.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_NewPopupFromAppPopup) {
   Browser* app_browser = CreateEmptyBrowserForType(Browser::TYPE_APP,
                                                    browser()->profile());
   // Open an app popup.
   browser::NavigateParams p1(MakeNavigateParams(app_browser));
   p1.disposition = NEW_POPUP;
+  p1.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p1);
   // Now open another app popup.
   browser::NavigateParams p2(MakeNavigateParams(p1.browser));
   p2.disposition = NEW_POPUP;
+  p2.window_bounds = gfx::Rect(0, 0, 200, 200);
   browser::Navigate(&p2);
 
   // Navigate() should have opened a new popup app window.
   EXPECT_NE(browser(), p1.browser);
   EXPECT_NE(p1.browser, p2.browser);
   EXPECT_EQ(Browser::TYPE_APP_POPUP, p2.browser->type());
 
   // We should now have four windows, the app window, the first app popup,
   // the second app popup, and the original browser() provided by the framework.
   EXPECT_EQ(4u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, app_browser->tab_count());
   EXPECT_EQ(1, p1.browser->tab_count());
   EXPECT_EQ(1, p2.browser->tab_count());
 }
 
 // This test verifies that navigating with WindowOpenDisposition = NEW_POPUP
 // from an extension app tab results in a new Browser with TYPE_APP_POPUP.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_NewPopupFromExtensionApp) {
   // TODO(beng): TBD.
 }
 
 // This test verifies that navigating with window_action = SHOW_WINDOW_INACTIVE
 // does not focus a new new popup window.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewPopupUnfocused) {
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = NEW_POPUP;
+  p.window_bounds = gfx::Rect(0, 0, 200, 200);
   p.window_action = browser::NavigateParams::SHOW_WINDOW_INACTIVE;
   browser::Navigate(&p);
   // Wait for new popup to load (and gain focus if the test fails).
   ui_test_utils::WaitForNavigationInCurrentTab(p.browser);
 
   // Navigate() should have opened a new, unfocused, popup window.
   EXPECT_NE(browser(), p.browser);
   EXPECT_EQ(Browser::TYPE_POPUP, p.browser->type());
 #if 0
 // TODO(stevenjb): Enable this test. See: crbug.com/79493
@@ skipping 443 matching lines @@
 
   // The bookmarks page should be opened in browser() window.
   EXPECT_NE(incognito_browser, p.browser);
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GURL("chrome://bookmarks"),
             browser()->GetSelectedTabContents()->GetURL());
 }
 
 }  // namespace