Fix for the RedirectTest.ClientServerServer test.

third_party/WebKit/Source/core/loader/FrameLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 202 matching lines @@
   visitor->trace(m_deferredHistoryLoad);
 }
 
 void FrameLoader::init() {
   ResourceRequest initialRequest(KURL(ParsedURLString, emptyString()));
   initialRequest.setRequestContext(WebURLRequest::RequestContextInternal);
   initialRequest.setFrameType(m_frame->isMainFrame()
                                   ? WebURLRequest::FrameTypeTopLevel
                                   : WebURLRequest::FrameTypeNested);
   m_provisionalDocumentLoader =
-      client()->createDocumentLoader(m_frame, initialRequest, SubstituteData());
+      client()->createDocumentLoader(m_frame, initialRequest, SubstituteData(),
+                                     ClientRedirectPolicy::NotClientRedirect);
   m_provisionalDocumentLoader->startLoadingMainResource();
   m_frame->document()->cancelParsing();
   m_stateMachine.advanceTo(
       FrameLoaderStateMachine::DisplayingInitialEmptyDocument);
   // Self-suspend if created in an already deferred Page. Note that both
   // startLoadingMainResource() and cancelParsing() may have already detached
   // the frame, since they both fire JS events.
   if (m_frame->page() && m_frame->page()->defersLoading())
     setDefersLoading(true);
   takeObjectSnapshot();
@@ skipping 1417 matching lines @@
   detachDocumentLoader(m_provisionalDocumentLoader);
 
   // beforeunload fired above, and detaching a DocumentLoader can fire events,
   // which can detach this frame.
   if (!m_frame->host())
     return;
 
   m_provisionalDocumentLoader = client()->createDocumentLoader(
       m_frame, request, frameLoadRequest.substituteData().isValid()
                             ? frameLoadRequest.substituteData()
-                            : defaultSubstituteDataForURL(request.url()));
+                            : defaultSubstituteDataForURL(request.url()),
+      frameLoadRequest.clientRedirect());
   m_provisionalDocumentLoader->setNavigationType(navigationType);
   m_provisionalDocumentLoader->setReplacesCurrentHistoryItem(
       type == FrameLoadTypeReplaceCurrentItem);
-  m_provisionalDocumentLoader->setIsClientRedirect(
-      frameLoadRequest.clientRedirect() ==
-      ClientRedirectPolicy::ClientRedirect);
-
   m_frame->navigationScheduler().cancel();
   m_checkTimer.stop();
 
   m_loadType = type;
 
   if (frameLoadRequest.form())
     client()->dispatchWillSubmitForm(frameLoadRequest.form());
 
   m_progressTracker->progressStarted();
-  if (m_provisionalDocumentLoader->isClientRedirect())
-    m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
   m_provisionalDocumentLoader->appendRedirect(
       m_provisionalDocumentLoader->request().url());
   double triggeringEventTime =
       frameLoadRequest.triggeringEvent()
           ? frameLoadRequest.triggeringEvent()->platformTimeStamp()
           : 0;
   client()->dispatchDidStartProvisionalLoad(triggeringEventTime);
   DCHECK(m_provisionalDocumentLoader);
   m_provisionalDocumentLoader->startLoadingMainResource();
 
@@ skipping 239 matching lines @@
                          m_documentLoader ? m_documentLoader->url() : String());
   return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const {
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this,
                                       toTracedValue());
 }
 
 }  // namespace blink