summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_browsertest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:15:33 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:15:33 +0000
commit616381f0a55322de447465573e39612e5af18b31 (patch)
tree4cbf687bb163f3dcd95e55e7be7fc9197e0dd8fd /chrome/browser/browser_browsertest.cc
parente5925962c61dbb9c8f5a5425ca2dc2953fb6a3e1 (diff)
downloadchromium_src-616381f0a55322de447465573e39612e5af18b31.zip
chromium_src-616381f0a55322de447465573e39612e5af18b31.tar.gz
chromium_src-616381f0a55322de447465573e39612e5af18b31.tar.bz2
Make all browser code use browser::Navigate to open tabs.
BUG=none TEST=existing unittests. Also, test all places where new tabs and windows are opened from UI, e.g. links in options, new tab button, Ctrl+T, popup windows, etc. Review URL: http://codereview.chromium.org/3834002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
-rw-r--r--chrome/browser/browser_browsertest.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 6c57f93..317695e 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_init.h"
#include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_navigator.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_window.h"
#include "chrome/browser/defaults.h"
@@ -206,10 +207,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) {
GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
FilePath(kTitle1File)));
ui_test_utils::NavigateToURL(browser(), url);
- Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
- params.index = 0;
- browser()->AddTabWithURL(&params);
- EXPECT_EQ(browser(), params.target);
+ AddTabAtIndex(0, url, PageTransition::TYPED);
EXPECT_EQ(2, browser()->tab_count());
EXPECT_EQ(0, browser()->selected_index());
TabContents* second_tab = browser()->GetTabContentsAt(1);
@@ -233,12 +231,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
FilePath(kTitle2File)));
// There is one initial tab.
- for (int ix = 0; ix != 33; ++ix) {
- Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
- params.index = 0;
- browser()->AddTabWithURL(&params);
- EXPECT_EQ(browser(), params.target);
- }
+ for (int ix = 0; ix != 33; ++ix)
+ browser()->AddSelectedTabWithURL(url, PageTransition::TYPED);
EXPECT_EQ(34, browser()->tab_count());
// See browser\renderer_host\render_process_host.cc for the algorithm to