Make all browser code use browser::Navigate to open tabs....

chrome/browser/browser_browsertest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/app_modal_dialog.h"
 #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"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/js_modal_dialog.h"
 #include "chrome/browser/native_app_modal_dialog.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 172 matching lines @@
 // Test is crashing on Mac, see http://crbug.com/29424.
 #define MAYBE_JavascriptAlertActivatesTab DISABLED_JavascriptAlertActivatesTab
 #else
 #define MAYBE_JavascriptAlertActivatesTab JavascriptAlertActivatesTab
 #endif
 
 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);
   ASSERT_TRUE(second_tab);
   second_tab->render_view_host()->ExecuteJavascriptInWebFrame(L"",
       L"alert('Activate!');");
   AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog();
   alert->CloseModalDialog();
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->selected_index());
 }
 
 // Create 34 tabs and verify that a lot of processes have been created. The
 // exact number of processes depends on the amount of memory. Previously we
 // had a hard limit of 31 processes and this test is mainly directed at
 // verifying that we don't crash when we pass this limit.
 // Warning: this test can take >30 seconds when running on a slow (low
 // memory?) Mac builder.
 IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) {
   GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory),
                                      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
   // decide how many processes to create.
   if (base::SysInfo::AmountOfPhysicalMemoryMB() >= 2048) {
     EXPECT_GE(CountRenderProcessHosts(), 24);
   } else {
     EXPECT_LE(CountRenderProcessHosts(), 23);
   }
 }
@@ skipping 400 matching lines @@
 
   // The normal browser should now have four.
   EXPECT_EQ(4, browser()->tab_count());
 
   // Close the additional browsers.
   popup_browser->CloseAllTabs();
   app_browser->CloseAllTabs();
   app_popup_browser->CloseAllTabs();
 }
 #endif