For Offliner, pass in the URL from WebContents to SavePage request instead of the request URL since…

chrome/browser/android/offline_pages/prerendering_offliner.cc

 // Copyright 2016 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 "chrome/browser/android/offline_pages/prerendering_offliner.h"
 
 #include "base/bind.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "components/offline_pages/background/save_page_request.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/web_contents.h"
 
 namespace offline_pages {
 
 PrerenderingOffliner::PrerenderingOffliner(
     content::BrowserContext* browser_context,
     const OfflinerPolicy* policy,
     OfflinePageModel* offline_page_model)
     : browser_context_(browser_context),
       offline_page_model_(offline_page_model),
       pending_request_(nullptr),
@@ skipping 23 matching lines @@
   }
 
   if (load_status == Offliner::RequestStatus::LOADED) {
     // The page has successfully loaded so now try to save the page.
     // After issuing the save request we will wait for either: the save
     // callback or a CANCELED load callback (triggered because the loaded
     // WebContents are being destroyed) - whichever callback occurs first.
     DCHECK(web_contents);
     std::unique_ptr<OfflinePageArchiver> archiver(
         new OfflinePageMHTMLArchiver(web_contents));
-    SavePage(request.url(), request.client_id(), std::move(archiver),
+    // Pass in the URL from the WebContents in case it is redirected from
+    // the requested URL. This is to work around a check in the
+    // OfflinePageModel implementation that ensures URL passed in here is
+    // same as LastCommittedURL from the snapshot.
+    // TODO(dougarnett): Raise issue of how to better deal with redirects.
+    SavePage(web_contents->GetLastCommittedURL(), request.client_id(),
+             std::move(archiver),
              base::Bind(&PrerenderingOffliner::OnSavePageDone,
                         weak_ptr_factory_.GetWeakPtr(), request,
                         completion_callback));
   } else {
     // Clear pending request and then run the completion callback.
     pending_request_.reset(nullptr);
     completion_callback.Run(request, load_status);
   }
 }
 
@@ skipping 84 matching lines @@
 }
 
 PrerenderingLoader* PrerenderingOffliner::GetOrCreateLoader() {
   if (!loader_) {
     loader_.reset(new PrerenderingLoader(browser_context_));
   }
   return loader_.get();
 }
 
 }  // namespace offline_pages