Update the URL if the user cancels a beforeunload handler.

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 1214 matching lines @@
       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.
     NavigationEntry* pending_entry = controller_.pending_entry();
     if (pending_entry && pending_entry->url() == validated_url) {
-      controller_.DiscardNonCommittedEntries();
-      // Update the URL display.
-      NotifyNavigationStateChanged(TabContents::INVALIDATE_URL);
+      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 725 matching lines @@
         &controller_,
         controller_.GetCurrentEntryIndex()));
   }
 
   SetIsLoading(false, details.get());
 
   // Notify observers about navigation.
   FOR_EACH_OBSERVER(TabContentsObserver, observers_, DidStopLoading());
 }
 
+void TabContents::DidCancelLoading() {
+  controller_.DiscardNonCommittedEntries();
+
+  // Update the URL display.
+  NotifyNavigationStateChanged(TabContents::INVALIDATE_URL);
+}
+
 void TabContents::DidChangeLoadProgress(double progress) {
   if (delegate())
     delegate()->LoadProgressChanged(progress);
 }
 
 void TabContents::DocumentOnLoadCompletedInMainFrame(
     RenderViewHost* render_view_host,
     int32 page_id) {
   NotificationService::current()->Notify(
       NotificationType::LOAD_COMPLETED_MAIN_FRAME,
@@ skipping 425 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));
 }