Add automation call to wait for multiple navigations.

chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc

 // Copyright (c) 2006-2008 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 <sstream>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 130 matching lines @@
   tab->NavigateToURL(
       server->TestServerPageW(L"files/sync_xmlhttprequest_during_unload.html"));
 
   // Confirm that the page has loaded (since it changes its title during load).
   std::wstring tab_title;
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
   EXPECT_EQ(L"sync xhr on unload", tab_title);
 
   // Navigate to a new page, to dispatch unload event and trigger xhr.
   // (the bug would make this step hang the renderer).
-  bool timed_out = false;
-  tab->NavigateToURLWithTimeout(server->TestServerPageW(L"files/title2.html"),
-                                action_max_timeout_ms(),
-                                &timed_out);
-  EXPECT_FALSE(timed_out);
+  tab->NavigateToURL(server->TestServerPageW(L"files/title2.html"));
 
   // Check that the new page got loaded, and that no download was triggered.
   EXPECT_TRUE(tab->GetTabTitle(&tab_title));
   EXPECT_EQ(L"Title Of Awesomeness", tab_title);
 
   bool shelf_is_visible = false;
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   EXPECT_TRUE(browser->IsShelfVisible(&shelf_is_visible));
   EXPECT_FALSE(shelf_is_visible);
 }
@@ skipping 75 matching lines @@
   ASSERT_TRUE(tab.get());
 
   // Start with an HTTP page.
   CheckTitleTest(L"content-sniffer-test0.html",
                  L"Content Sniffer Test 0");
 
   // Now load a file:// page, which does not use the BufferedEventHandler.
   // Make sure that the page loads and displays a title, and doesn't get stuck.
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("title2.html");
-  bool timed_out = false;
-  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(test_file),
-                                action_max_timeout_ms(),
-                                &timed_out);
-  EXPECT_FALSE(timed_out);
+  tab->NavigateToURL(net::FilePathToFileURL(test_file));
   EXPECT_EQ(L"Title Of Awesomeness", GetActiveTabTitle());
 }
 
 // Tests that a cross-site navigation to an error page (resulting in the link
 // doctor page) still runs the onunload handler and can support navigations
 // away from the link doctor page.  (Bug 1235537)
 TEST_F(ResourceDispatcherTest, CrossSiteNavigationErrorPage) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
@@ skipping 59 matching lines @@
   // 2-  http://mock.http/redirect-to-title2.html
   // 3-  http://mock.http/title2.html
   //
   // If the redirect in #2 were not blocked, we'd also see a request
   // for http://mock.http:4000/title2.html.
   //
   EXPECT_EQ(3, after - before);
 }
 
 }  // namespace