Store original request URL in offline page metadata table

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 "base/metrics/histogram_macros.h"
 #include "base/sys_info.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
@@ skipping 67 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));
-    // 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(),
-             request.request_id(), std::move(archiver),
+
+    OfflinePageModel::SavePageParams save_page_params;
+    save_page_params.url = web_contents->GetLastCommittedURL();
+    save_page_params.client_id = request.client_id();
+    save_page_params.proposed_offline_id = request.request_id();
+    // Pass in the original URL if it is different from the last committed URL
+    // when redirects occur.
+    if (save_page_params.url != request.url())
+      save_page_params.original_url = request.url();
+
+    SavePage(save_page_params, std::move(archiver),
              base::Bind(&PrerenderingOffliner::OnSavePageDone,
                         weak_ptr_factory_.GetWeakPtr(), request));
   } else {
     // Clear pending request and app listener then run completion callback.
     pending_request_.reset(nullptr);
     app_listener_.reset(nullptr);
     completion_callback_.Run(request, load_status);
   }
 }
 
@@ skipping 130 matching lines @@
 void PrerenderingOffliner::SetLowEndDeviceForTesting(bool is_low_end_device) {
   is_low_end_device_ = is_low_end_device;
 }
 
 void PrerenderingOffliner::SetApplicationStateForTesting(
     base::android::ApplicationState application_state) {
   OnApplicationStateChange(application_state);
 }
 
 void PrerenderingOffliner::SavePage(
-    const GURL& url,
-    const ClientId& client_id,
-    int64_t proposed_offline_id,
+    const OfflinePageModel::SavePageParams& save_page_params,
     std::unique_ptr<OfflinePageArchiver> archiver,
     const SavePageCallback& save_callback) {
   DCHECK(offline_page_model_);
-  offline_page_model_->SavePage(url, client_id, proposed_offline_id,
-                                std::move(archiver), save_callback);
+  offline_page_model_->SavePage(
+      save_page_params, std::move(archiver), save_callback);
 }
 
 PrerenderingLoader* PrerenderingOffliner::GetOrCreateLoader() {
   if (!loader_) {
     loader_.reset(new PrerenderingLoader(browser_context_));
   }
   return loader_.get();
 }
 
 void PrerenderingOffliner::OnApplicationStateChange(
     base::android::ApplicationState application_state) {
   if (pending_request_ && is_low_end_device_ &&
       application_state ==
           base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) {
     DVLOG(1) << "App became active, canceling current offlining request";
     SavePageRequest* request = pending_request_.get();
     Cancel();
     completion_callback_.Run(*request,
                              Offliner::RequestStatus::FOREGROUND_CANCELED);
   }
 }
 
 }  // namespace offline_pages