Trigger redirect for offline pages

chrome/browser/android/offline_pages/offline_page_request_job.cc

Index: chrome/browser/android/offline_pages/offline_page_request_job.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_request_job.cc b/chrome/browser/android/offline_pages/offline_page_request_job.cc
index 545721dceda786a4a5790b3b99e9a9d109cc78f6..1d0df1839355156eddc6ccfb88515eb3e2a14870 100644
--- a/chrome/browser/android/offline_pages/offline_page_request_job.cc
+++ b/chrome/browser/android/offline_pages/offline_page_request_job.cc
@@ -27,7 +27,10 @@
 #include "content/public/common/resource_type.h"
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_request_headers.h"
+#include "net/http/http_response_headers.h"
+#include "net/http/http_util.cc"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_redirect_job.h"
 
 namespace offline_pages {
 
@@ -567,6 +570,44 @@ void OfflinePageRequestJob::Kill() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
+bool OfflinePageRequestJob::IsRedirectResponse(GURL* location,
+                                               int* http_status_code) {
+  // Invoke the default implementation in URLRequestJob which will process the
+  // redirect if GetResponseCode sets the redirect headers.
+  return URLRequestJob::IsRedirectResponse(location, http_status_code);
+}

[mmenke, 2016/11/17 18:42:26]

If you're relying on the default implementation, don't need this method.

[jianli, 2016/11/17 23:42:05]

We need this because default implementation goes to
URLRequestFileJob::IsRedirectResponse since OfflinePageRequestJob derives from
URLRequestFileJob. Updated comment.

+
+void OfflinePageRequestJob::GetResponseInfo(net::HttpResponseInfo* info) {
+  if (!fake_headers_for_redirect_.get()) {

[fgorski, 2016/11/17 17:37:48]

this should be enough:

if (!fake_headers_for_redirect_) {

[jianli, 2016/11/17 23:42:05]

Done.

+    URLRequestFileJob::GetResponseInfo(info);
+    return;
+  }
+
+  info->headers = fake_headers_for_redirect_;
+  info->request_time = redirect_response_time_;
+  info->response_time = redirect_response_time_;
+}
+
+void OfflinePageRequestJob::GetLoadTimingInfo(
+    net::LoadTimingInfo* load_timing_info) const {
+  // Set send_start and send_end to receive_redirect_headers_end_ to be
+  // consistent with network cache behavior.
+  load_timing_info->send_start = receive_redirect_headers_end_;
+  load_timing_info->send_end = receive_redirect_headers_end_;
+  load_timing_info->receive_headers_end = receive_redirect_headers_end_;
+}
+
+bool OfflinePageRequestJob::CopyFragmentOnRedirect(const GURL& location) const {
+  return false;
+}
+
+int OfflinePageRequestJob::GetResponseCode() const {
+  if (!fake_headers_for_redirect_.get())

[fgorski, 2016/11/17 17:37:48]

ditto

[jianli, 2016/11/17 23:42:05]

Done.

+    return URLRequestFileJob::GetResponseCode();
+
+  return net::URLRequestRedirectJob::REDIRECT_302_FOUND;
+}
+
 void OfflinePageRequestJob::FallbackToDefault() {
   OfflinePageRequestInfo* info =
       OfflinePageRequestInfo::GetFromRequest(request());
@@ -592,8 +633,24 @@ void OfflinePageRequestJob::OnOfflineFilePathAvailable(
 
 void OfflinePageRequestJob::OnOfflineRedirectAvailabe(
     const GURL& redirected_url) {
-  // TODO(jianli): kicks off the redirect. For now, use the default.
-  FallbackToDefault();
+  receive_redirect_headers_end_ = base::TimeTicks::Now();
+  redirect_response_time_ = base::Time::Now();
+
+  std::string header_string =
+      base::StringPrintf("HTTP/1.1 %i Internal Redirect\n"
+                             // Clear referrer to avoid leak when going online.
+                             "Referrer-Policy: no-referrer\n"
+                             "Location: %s\n"
+                             "Non-Authoritative-Reason: offline redirects",
+                         net::URLRequestRedirectJob::REDIRECT_302_FOUND,

[mmenke, 2016/11/17 18:42:26]

Comment that a 302 is used to remove response bodies, to prevent leaking them in
case this is what happens with the real sites?

[jianli, 2016/11/17 23:42:05]

Done.

+                         redirected_url.spec().c_str());

[mmenke, 2016/11/17 18:42:26]

Need to include gurl.h

[jianli, 2016/11/17 23:42:05]

Done.

+
+  fake_headers_for_redirect_ = new net::HttpResponseHeaders(
+      net::HttpUtil::AssembleRawHeaders(header_string.c_str(),
+                                        header_string.length()));
+  DCHECK(fake_headers_for_redirect_->IsRedirect(NULL));

[fgorski, 2016/11/17 17:37:48]

nit: would nullptr work here?

[jianli, 2016/11/17 23:42:05]

Done.

+
+  URLRequestJob::NotifyHeadersComplete();
 }
 
 void OfflinePageRequestJob::SetDelegateForTesting(