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

2 files changed, 9 insertions, 10 deletions

diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 48cea7f..1321422 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -13,6 +13,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser.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/extensions/extensions_service.h"
@@ -552,10 +553,12 @@ class SessionRestoreImpl : public NotificationObserver {
       if (i == 0)
         add_types |= TabStripModel::ADD_SELECTED;
       int index = browser->GetIndexForInsertionDuringRestore(i);
-      Browser::AddTabWithURLParams params(urls[i], PageTransition::START_PAGE);
-      params.index = index;
-      params.add_types = add_types;
-      browser->AddTabWithURL(&params);
+      browser::NavigateParams params(browser, urls[i],
+                                     PageTransition::START_PAGE);
+      params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
+      params.tabstrip_index = index;
+      params.tabstrip_add_types = add_types;
+      browser::Navigate(&params);
     }
   }
 
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 9ff065d..c05a34b 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -77,14 +77,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
 
   // Add and navigate three tabs.
   ui_test_utils::NavigateToURL(browser(), url1);
-  Browser::AddTabWithURLParams params1(url2, PageTransition::LINK);
-  browser()->AddTabWithURL(&params1);
-  EXPECT_EQ(browser(), params1.target);
+  browser()->AddSelectedTabWithURL(url2, PageTransition::LINK);
   ui_test_utils::WaitForNavigationInCurrentTab(browser());
 
-  Browser::AddTabWithURLParams params2(url3, PageTransition::LINK);
-  browser()->AddTabWithURL(&params2);
-  EXPECT_EQ(browser(), params2.target);
+  browser()->AddSelectedTabWithURL(url3, PageTransition::LINK);
   ui_test_utils::WaitForNavigationInCurrentTab(browser());
 
   TabRestoreService* service = browser()->profile()->GetTabRestoreService();