commit 5d9cace7e6863ec4179db4152320383a7e3c2ee2
author ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jun 21 16:07:12 2012
committer ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Jun 21 16:07:12 2012
tree de13c582bd1ee7be72ae246463864a3658676d0c
parent 7b8b2bb5046091860c81a9521273c385df0682bb

Move singleton tabs off Browser.

http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10579043

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143385 0039d316-1c4b-4281-b951-d872f2087c98

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 8e6515e..36f75e8 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ -1041,7 +1042,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1058,7 +1059,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1078,7 +1079,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1097,7 +1098,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
@@ -1110,7 +1111,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1122,7 +1123,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
@@ -1135,7 +1136,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenClearBrowsingDataDialog();
+    chrome::ShowClearBrowsingDataDialog(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1149,7 +1150,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenClearBrowsingDataDialog();
+    chrome::ShowClearBrowsingDataDialog(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
@@ -1170,7 +1171,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   {
@@ -1186,7 +1187,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenOptionsDialog();
+    chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
@@ -1238,7 +1239,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->ShowHistoryTab();
+    chrome::ShowHistory(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1252,7 +1253,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->OpenBookmarkManager();
+    chrome::ShowBookmarkManager(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
@@ -1266,7 +1267,7 @@
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->ShowDownloadsTab();
+    chrome::ShowDownloads(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());