Don't change PrerenderTracker state in WillTransferRequestToNewProcess

Not all of the prerender state was being updated in that function. Instead,
DCHECK that we're not in a prerender. Prerender can't handle cross-process
navigations right now and should abort the prerender before the navigation
occurs. This reverts the PrerenderTracker parts of
https://src.chromium.org/viewvc/chrome?revision=225263&view=revision

Add a browser test which tests that prerenders are aborted correctly. Also
clean up a bit of %-escaping for redirects in the tests.

BUG=298988,106407
TEST=PrerenderBrowserTest.PrerenderCrossProcessServerRedirect

Review URL: https://codereview.chromium.org/24810003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225987 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 11 deletions

diff --git a/chrome/browser/prerender/prerender_tracker.cc b/chrome/browser/prerender/prerender_tracker.cc
index ff45256..a490ac9 100644
--- a/chrome/browser/prerender/prerender_tracker.cc
+++ b/chrome/browser/prerender/prerender_tracker.cc
@@ -189,17 +189,6 @@ bool PrerenderTracker::IsPrerenderingOnIOThread(int child_id,
   return possibly_prerendering_io_thread_set_.count(child_route_id_pair) > 0;
 }
 
-void PrerenderTracker::UpdatePrerenderStateForTransfer(int old_child_id,
-                                                       int old_route_id,
-                                                       int new_child_id,
-                                                       int new_route_id) {
-  ChildRouteIdPair old_pair(old_child_id, old_route_id);
-  ChildRouteIdPair new_pair(new_child_id, new_route_id);
-
-  RemovePrerenderOnIOThread(old_pair);
-  AddPrerenderOnIOThread(new_pair);
-}
-
 void PrerenderTracker::AddPrerenderOnIOThread(
     const ChildRouteIdPair& child_route_id_pair) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));