Don't show URL for pending new navigations initiated by the renderer.

chrome/test/base/browser_with_test_window_test.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 "chrome/test/base/browser_with_test_window_test.h"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 52 matching lines @@
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
   CommitPendingLoad(&params.target_contents->controller());
 }
 
 void BrowserWithTestWindowTest::CommitPendingLoad(
     NavigationController* controller) {
   if (!controller->pending_entry())
     return;  // Nothing to commit.
 
-  TestRenderViewHost* test_rvh =
+  TestRenderViewHost* old_rvh =
       TestRenderViewHostForTab(controller->tab_contents());
   MockRenderProcessHost* mock_rph = static_cast<MockRenderProcessHost*>(
-    test_rvh->process());
+    old_rvh->process());
+
+  TestRenderViewHost* pending_rvh = static_cast<TestRenderViewHost*>(
+      controller->tab_contents()->render_manager_for_testing()->
+      pending_render_view_host());
+  if (pending_rvh) {
+    // Simulate the ShouldClose_ACK that is received from the current renderer
+    // for a cross-site navigation.
+    DCHECK(old_rvh != pending_rvh);

[Paweł Hajdan Jr., 2011/10/11 22:26:18]

nit: DCHECK_NE.

[Charlie Reis, 2011/10/12 21:55:56]

Done.

+    old_rvh->SendShouldCloseACK(true);
+  }
+  // Commit on the pending_rvh, if one exists.
+  TestRenderViewHost* test_rvh = pending_rvh ? pending_rvh : old_rvh;
 
   // For new navigations, we need to send a larger page ID. For renavigations,
   // we need to send the preexisting page ID. We can tell these apart because
   // renavigations will have a pending_entry_index while new ones won't (they'll
   // just have a standalong pending_entry that isn't in the list already).
   if (controller->pending_entry_index() >= 0) {
-    test_rvh->SendNavigate(controller->pending_entry()->page_id(),
-                           controller->pending_entry()->url());
+    test_rvh->SendNavigateWithTransition(
+        controller->pending_entry()->page_id(),
+        controller->pending_entry()->url(),
+        controller->pending_entry()->transition_type());
   } else {
-    test_rvh->SendNavigate(mock_rph->max_page_id() + 1,
-                           controller->pending_entry()->url());
+    test_rvh->SendNavigateWithTransition(
+        mock_rph->max_page_id() + 1,
+        controller->pending_entry()->url(),
+        controller->pending_entry()->transition_type());
+    mock_rph->UpdateMaxPageID(mock_rph->max_page_id() + 1);
   }
+
+  // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
+  // without making any network requests.
+  if (pending_rvh)
+    old_rvh->OnSwapOutACK();
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommit(
     NavigationController* controller,
     const GURL& url) {
   controller->LoadURL(url, GURL(), PageTransition::LINK, std::string());
   CommitPendingLoad(controller);
 }
 
 void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) {
   NavigateAndCommit(&browser()->GetSelectedTabContents()->controller(), url);
 }
 
 void BrowserWithTestWindowTest::DestroyBrowser() {
   if (!browser_.get())
     return;
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }