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

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/auto_reset.h"
 #include "base/metrics/histogram.h"
@@ skipping 1369 matching lines @@
 
     // Check if the URL we are about to load has been prerendered by any chance,
     // and use it if possible.
     MaybeUsePreloadedPage(url);
   }
 }
 
 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();
   else
     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.
   MaybeUsePreloadedPage(target_url);
 }
 
 void TabContents::OnDidFailProvisionalLoadWithError(
     int64 frame_id,
     bool is_main_frame,
     int error_code,
@@ skipping 1444 matching lines @@
 }
 
 bool TabContents::MaybeUsePreloadedPage(const GURL& url) {
   prerender::PrerenderManager* pm = profile()->GetPrerenderManager();
   if (pm != NULL) {
     if (pm->MaybeUsePreloadedPage(this, url))
       return true;
   }
   return false;
 }