Revert 195553 "Allow showing pending URL for new tab navigations..."

trunk/src/chrome/browser/external_extension_browsertest.cc

 // Copyright (c) 2012 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/command_line.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 40 matching lines @@
   }
 
   IsSearchProviderTestData StartIsSearchProviderInstalledTest(
       Browser* browser,
       const char* host,
       const char* expected_result) {
     GURL test_url(std::string("http://") + host +
         search_provider_test_url_.path() + "#" + expected_result);
     ui_test_utils::NavigateToURLWithDisposition(
         browser, test_url, NEW_FOREGROUND_TAB,
-        ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+        ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
     // Bundle up information needed to verify the result.
     content::WebContents* tab =
         browser->tab_strip_model()->GetActiveWebContents();
     return IsSearchProviderTestData(tab, host, test_url);
   }
 
   void FinishIsSearchProviderInstalledTest(
       const IsSearchProviderTestData& data) {
     string16 title = data.tab->GetTitle();
@@ skipping 65 matching lines @@
 IN_PROC_BROWSER_TEST_F(SearchProviderTest,
                        TestIsSearchProviderInstalledWithException) {
   // Change the url for the test page to one that throws an exception when
   // toString is called on the argument given to isSearchProviderInstalled.
   search_provider_test_url_ = test_server()->GetURL(
       "files/is_search_provider_installed_with_exception.html");
 
   FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest(
       browser(), "www.google.com", ""));
 }