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

chrome/browser/ssl/ssl_browser_tests.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 "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_navigator.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/cert_status_flags.h"
@@ skipping 429 matching lines @@
       https_server_.GetURL("files/ssl/blank_page.html"));
 
   TabContents* tab1 = browser()->GetSelectedTabContents();
 
   // This tab should be fine.
   CheckAuthenticatedState(tab1, false);
 
   // Create a new tab.
   GURL url = https_server_.GetURL(
       "files/ssl/page_displays_insecure_content.html");
-  Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
-  params.index = 0;
-  params.instance = tab1->GetSiteInstance();
-  TabContents* tab2 = browser()->AddTabWithURL(&params);
+  browser::NavigateParams params(browser(), url, PageTransition::TYPED);
+  params.disposition = NEW_FOREGROUND_TAB;
+  params.tabstrip_index = 0;
+  params.source_contents = tab1;
+  browser::Navigate(&params);
+  TabContents* tab2 = params.target_contents;
   ui_test_utils::WaitForNavigation(&(tab2->controller()));
 
   // The new tab has insecure content.
   CheckAuthenticatedState(tab2, true);
 
   // The original tab should not be contaminated.
   CheckAuthenticatedState(tab1, false);
 }
 
 // Visits two pages from the same origin: one that runs insecure content and one
 // that doesn't.  The test checks that we propagate the insecure content state
 // from one to the other.
 IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(https_server_.Start());
 
   ui_test_utils::NavigateToURL(browser(),
       https_server_.GetURL("files/ssl/blank_page.html"));
 
   TabContents* tab1 = browser()->GetSelectedTabContents();
 
   // This tab should be fine.
   CheckAuthenticatedState(tab1, false);
 
   // Create a new tab.
   GURL url =
       https_server_.GetURL("files/ssl/page_runs_insecure_content.html");
-  Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
-  params.instance = tab1->GetSiteInstance();
-  TabContents* tab2 = browser()->AddTabWithURL(&params);
+  browser::NavigateParams params(browser(), url, PageTransition::TYPED);
+  params.disposition = NEW_FOREGROUND_TAB;
+  params.source_contents = tab1;
+  browser::Navigate(&params);
+  TabContents* tab2 = params.target_contents;
   ui_test_utils::WaitForNavigation(&(tab2->controller()));
 
   // The new tab has insecure content.
   CheckAuthenticationBrokenState(tab2, 0, true, false);
 
   // Which means the origin for the first tab has also been contaminated with
   // insecure content.
   CheckAuthenticationBrokenState(tab1, 0, true, false);
 }
 
@@ skipping 121 matching lines @@
       break;
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                             new MessageLoop::QuitTask(), 1000);
     ui_test_utils::RunMessageLoop();
   }
   ASSERT_EQ(1, static_cast<int>(tab1->constrained_window_count()));
 
   // Let's add another tab to make sure the browser does not exit when we close
   // the first tab.
   GURL url = test_server()->GetURL("files/ssl/google.html");
-  Browser::AddTabWithURLParams params(url, PageTransition::TYPED);
-  TabContents* tab2 = browser()->AddTabWithURL(&params);
+  TabContents* tab2 =
+      browser()->AddSelectedTabWithURL(url, PageTransition::TYPED);
   ui_test_utils::WaitForNavigation(&(tab2->controller()));
 
-  // Ensure that the tab was created in the correct browser.
-  EXPECT_EQ(browser(), params.target);
-
   // Close the first tab.
   browser()->CloseTabContents(tab1);
 }
 
 // Visit a page over bad https that is a redirect to a page with good https.
 // Marked as flaky, see bug 40932.
 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) {
   ASSERT_TRUE(https_server_.Start());
   ASSERT_TRUE(https_server_expired_.Start());
 
@@ skipping 302 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.