Ensure address bar is reset after a redirect turns into a download.

content/browser/tab_contents/tab_contents.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 "content/browser/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 835 matching lines @@
     // Because this will not tear down the interstitial properly, if "back" is
     // back to another tab type, the interstitial will still be somewhat alive
     // in the previous tab type. If you navigate somewhere that activates the
     // tab with the interstitial again, you'll see a flash before the new load
     // commits of the interstitial page.
     if (showing_interstitial_page()) {
       LOG(WARNING) << "Discarding message during interstitial.";
       return;
     }
 
-    // This will discard our pending entry if we cancelled the load (e.g., if we
-    // decided to download the file instead of load it). Only discard the
-    // pending entry if the URLs match, otherwise the user initiated a navigate
-    // before the page loaded so that the discard would discard the wrong entry.
+    // Discard our pending entry if the load canceled (e.g. if we decided to
+    // download the file instead of load it).  We do not verify that the URL
+    // being canceled matches the pending entry's URL because they will not
+    // match if a redirect occurred (in which case we do not want to leave a
+    // stale redirect URL showing).  This means that we also cancel the pending
+    // entry if the user started a new navigation.  As a result, the navigation
+    // controller may not remember that a load is in progress, but the
+    // navigation will still commit even if there is no pending entry.
     NavigationEntry* pending_entry = controller_.pending_entry();
-    if (pending_entry && pending_entry->url() == validated_url) {
+    if (pending_entry)
       DidCancelLoading();
-    }
 
     render_manager_.RendererAbortedProvisionalLoad(render_view_host());
   }
 
   // Send out a notification that we failed a provisional load with an error.
   ProvisionalLoadDetails details(
       is_main_frame, controller_.IsURLInPageNavigation(validated_url),
       validated_url, std::string(), false, frame_id);
   details.set_error_code(error_code);
 
@@ skipping 964 matching lines @@
 
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = view()->CreateViewForWidget(rvh);
   rwh_view->SetSize(view()->GetContainerSize());
 }
 
 void TabContents::OnOnlineStateChanged(bool online) {
   render_view_host()->Send(new ViewMsg_NetworkStateChanged(
       render_view_host()->routing_id(), online));
 }