Merge 80639 - Prevent changes to NavigationEntry's URL for a provisional redirect.BUG=77786TEST=V...

content/browser/tab_contents/tab_contents.cc

Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc	(revision 80689)
+++ content/browser/tab_contents/tab_contents.cc	(working copy)
@@ -1387,6 +1387,9 @@
 void TabContents::OnDidRedirectProvisionalLoad(int32 page_id,
                                                const GURL& source_url,
                                                const GURL& target_url) {
+  // TODO(creis): Remove this method and have the pre-rendering code listen to
+  // the ResourceDispatcherHost's RESOURCE_RECEIVED_REDIRECT notification
+  // instead.  See http://crbug.com/78512.
   NavigationEntry* entry;
   if (page_id == -1)
     entry = controller_.pending_entry();
@@ -1394,7 +1397,6 @@
     entry = controller_.GetEntryWithPageID(GetSiteInstance(), page_id);
   if (!entry || entry->url() != source_url)
     return;
-  entry->set_url(target_url);
 
   // Check if the URL we are about to load has been prerendered by any chance,
   // and use it if possible.