Open Options page on top of NTP.

chrome/browser/ui/browser_navigator_browsertest.cc

Index: chrome/browser/ui/browser_navigator_browsertest.cc
diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc
index 2ccdbaaadf35801e26b925ae8cae77fb9e1c974e..6d30538d11e1edd1306c6c97cb956a79c0cf9930 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -886,4 +886,105 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
   EXPECT_FALSE(tab_contents->is_crashed());
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromDefaultToOptionsInSameTab) {
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/browser"),

[Paweł Hajdan Jr., 2011/06/18 10:38:51]

nit: Please use chrome/common/url_constants for all of those chrome:// URLs.

+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromBlankToOptionsInSameTab) {
+  browser::NavigateParams p(MakeNavigateParams());
+  p.url = GURL("about:blank");
+  browser::Navigate(&p);

[Paweł Hajdan Jr., 2011/06/18 10:38:51]

Why not just NavigateToURL?

+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/browser"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromNTPToOptionsInSameTab) {
+  browser::NavigateParams p(MakeNavigateParams());
+  p.url = GURL("chrome://newtab");
+  browser::Navigate(&p);
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://newtab"),
+            browser()->GetSelectedTabContents()->GetURL());
+
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/browser"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromPageToOptionsInNewTab) {
+  browser::NavigateParams p(MakeNavigateParams());
+  browser::Navigate(&p);
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());

[Paweł Hajdan Jr., 2011/06/18 10:38:51]

Those WaitForNavigation... calls are all racy. I think this should all use a
WindowedNotificationObserver, to register for notifications _before_ triggering
the navigation. I think that to fix it you'd need to change
NavigationNotificationObserver in ui_test_utils a bit. Please let me know if
you'd need more details.

+  EXPECT_EQ(GetGoogleURL(), browser()->GetSelectedTabContents()->GetURL());
+  EXPECT_EQ(1u, BrowserList::size());
+  EXPECT_EQ(1, browser()->tab_count());
+
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(2, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/browser"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,

[Greg Billock, 2011/06/17 21:16:07]

I moved this to the end, and now they all pass with no timeouts! :-/

+                       NavigateFromOtherTabToSingletonOptions) {
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());

[Paweł Hajdan Jr., 2011/06/18 10:38:51]

Please check return value of this.

+  browser()->AddSelectedTabWithURL(GetGoogleURL(), PageTransition::LINK);
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+
+  browser()->OpenOptionsDialog();
+  EXPECT_EQ(2, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/browser"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromNTPToOptionsSingleton) {
+  browser()->OpenOptionsDialog();
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+
+  browser()->NewTab();
+  EXPECT_EQ(2, browser()->tab_count());
+
+  browser()->OpenOptionsDialog();
+  EXPECT_EQ(2, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
+                       NavigateFromNTPToOptionsPageInSameTab) {
+  browser()->ShowOptionsTab("personal");
+  ui_test_utils::WaitForNavigationInCurrentTab(browser());
+  EXPECT_EQ(1, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/personal"),
+            browser()->GetSelectedTabContents()->GetURL());
+
+  browser()->NewTab();
+  EXPECT_EQ(2, browser()->tab_count());
+
+  browser()->ShowOptionsTab("personal");
+  EXPECT_EQ(2, browser()->tab_count());
+  EXPECT_EQ(GURL("chrome://settings/personal"),
+            browser()->GetSelectedTabContents()->GetURL());
+}
+
 }  // namespace