Load live version when reloading an offline page on connected network

chrome/browser/android/offline_pages/offline_page_tab_helper.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/offline_page_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_request_job.h"
@@ skipping 25 matching lines @@
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
 
   // This is a new navigation so we can invalidate any previously scheduled
   // operations.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
   // Since this is a new navigation, we will reset the cached offline page,
   offline_page_ = nullptr;
+  offline_header_.Clear();

[Dmitry Titov, 2016/09/16 21:37:23]

after rebase, you will need to do figure out when to save/set the header as I
did with provisional_offline_page_...

[jianli, 2016/09/16 23:08:48]

Yes. I think we should also avoid clearing is_offline_preview_.

Fixed.

   is_offline_preview_ = false;
 
   reloading_url_on_net_error_ = false;
 }
 
 void OfflinePageTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
@@ skipping 50 matching lines @@
         OfflinePageRequestJob::AggregatedRequestResult::
             PAGE_NOT_FOUND_ON_FLAKY_NETWORK);
     return;
   }
 
   reloading_url_on_net_error_ = true;
 
   // Reloads the page with extra header set to force loading the offline page.
   content::NavigationController::LoadURLParams load_params(offline_page->url);
   load_params.transition_type = ui::PAGE_TRANSITION_RELOAD;
-  load_params.extra_headers = kOfflinePageHeader;
-  load_params.extra_headers += ":";
-  load_params.extra_headers += kOfflinePageHeaderReasonKey;
-  load_params.extra_headers += "=";
-  load_params.extra_headers += kOfflinePageHeaderReasonValueDueToNetError;
+  OfflinePageHeader offline_header;
+  offline_header.reason = OfflinePageHeader::Reason::NET_ERROR;
+  load_params.extra_headers = offline_header.ToFullHeaderString();
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
-void OfflinePageTabHelper::SetOfflinePage(const OfflinePageItem& offline_page,
-                                          bool is_offline_preview) {
+void OfflinePageTabHelper::SetOfflinePage(
+    const OfflinePageItem& offline_page,
+    const OfflinePageHeader& offline_header,
+    bool is_offline_preview) {
   offline_page_ = base::MakeUnique<OfflinePageItem>(offline_page);
+  offline_header_ = offline_header;
   is_offline_preview_ = is_offline_preview;
 }
 
 }  // namespace offline_pages