Re-land:

chrome/browser/ui/find_bar/find_bar_host_browsertest.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 821 matching lines @@
 
   // Find "Default".
   int ordinal = 0;
   TabContentsWrapper* tab1 = browser()->GetSelectedTabContentsWrapper();
   EXPECT_EQ(1, FindInPageWchar(tab1, L"Default", kFwd, kIgnoreCase, &ordinal));
 
   // Create a second tab.
   // For some reason we can't use AddSelectedTabWithURL here on ChromeOS. It
   // could be some delicate assumption about the tab starting off unselected or
   // something relating to user gesture.
-  browser::NavigateParams params(browser(), url, PageTransition::TYPED);
-  params.disposition = NEW_BACKGROUND_TAB;
-  params.tabstrip_add_types = TabStripModel::ADD_NONE;
-  browser::Navigate(&params);
-  browser()->ActivateTabAt(1, false);
+  browser()->AddBlankTab(true);
+  ui_test_utils::NavigateToURL(browser(), url);
   TabContentsWrapper* tab2 = browser()->GetSelectedTabContentsWrapper();
   EXPECT_NE(tab1, tab2);
 
   // Find "given".
   FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal);
 
   // Switch back to first tab.
   browser()->ActivateTabAt(0, false);
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
@@ skipping 99 matching lines @@
   // Open the Find box.
   EnsureFindBoxOpen();
 
   EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarText());
 
   // Close the Find box.
   browser()->GetFindBarController()->EndFindSession(
       FindBarController::kKeepSelection);
 
   // Now create a second tab and load the same page.
-  browser::NavigateParams params(browser(), url, PageTransition::TYPED);
-  params.disposition = NEW_BACKGROUND_TAB;
-  params.tabstrip_add_types = TabStripModel::ADD_NONE;
-  browser::Navigate(&params);
-  browser()->ActivateTabAt(1, false);
+  browser()->AddBlankTab(true);
+  ui_test_utils::NavigateToURL(browser(), url);
   TabContentsWrapper* tab2 = browser()->GetSelectedTabContentsWrapper();
   EXPECT_NE(tab1, tab2);
 
   // Search for the word "text".
   FindInPageWchar(tab2, L"text", kFwd, kIgnoreCase, &ordinal);
 
   // Go back to the first tab and make sure we have NOT switched the prepopulate
   // text to "text".
   browser()->ActivateTabAt(0, false);
 
@@ skipping 98 matching lines @@
 
   TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
   int ordinal = 0;
   FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal);
   EXPECT_EQ(ordinal, 1);
 
   // End the find session, click on the link.
   tab->find_tab_helper()->StopFinding(FindBarController::kActivateSelection);
   EXPECT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
 }