Fix for the RedirectTest.ClientServerServer test.

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

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 78 matching lines @@
   // effective script origin of the Document are those it was assigned when its
   // browsing context was created.
   //
   // Note: We generalize this to all "blank" URLs and invalid URLs because we
   // treat all of these URLs as about:blank.
   return url.isEmpty() || url.protocolIsAbout();
 }
 
 DocumentLoader::DocumentLoader(LocalFrame* frame,
                                const ResourceRequest& req,
-                               const SubstituteData& substituteData)
+                               const SubstituteData& substituteData,
+                               bool clientRedirect)
     : m_frame(frame),
       m_fetcher(FrameFetchContext::createContextAndFetcher(this, nullptr)),
       m_originalRequest(req),
       m_substituteData(substituteData),
       m_request(req),
-      m_isClientRedirect(false),
+      m_isClientRedirect(clientRedirect),
       m_replacesCurrentHistoryItem(false),
       m_dataReceived(false),
       m_navigationType(NavigationTypeOther),
       m_documentLoadTiming(*this),
       m_timeOfLastDataReceived(0.0),
       m_applicationCacheHost(ApplicationCacheHost::create(this)),
       m_wasBlockedAfterXFrameOptionsOrCSP(false),
       m_state(NotStarted),
       m_inDataReceived(false),
-      m_dataBuffer(SharedBuffer::create()) {}
+      m_dataBuffer(SharedBuffer::create()) {
+  // The document URL needs to be added to the head of the list as that is
+  // where the redirects originated.
+  if (m_isClientRedirect)
+    appendRedirect(m_frame->document()->url());
+}
 
 FrameLoader* DocumentLoader::frameLoader() const {
   if (!m_frame)
     return nullptr;
   return &m_frame->loader();
 }
 
 DocumentLoader::~DocumentLoader() {
   DCHECK(!m_frame);
   DCHECK(!m_mainResource);
@@ skipping 661 matching lines @@
                              m_writer ? m_writer->encoding() : emptyAtom, true,
                              ForceSynchronousParsing);
   if (!source.isNull())
     m_writer->appendReplacingData(source);
   endWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink