Load live version when reloading an offline page on connected network

chrome/browser/android/offline_pages/offline_page_utils.cc

 // Copyright 2015 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_utils.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 #include "chrome/browser/android/tab_android.h"
 #include "components/offline_pages/client_namespace_constants.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
+#include "components/offline_pages/request_header/offline_page_header.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 namespace {
 
 // Returns an offline page that is stored as the |offline_url|.
 const OfflinePageItem* GetOfflinePageForOfflineURL(
     content::BrowserContext* browser_context,
@@ skipping 114 matching lines @@
       GetOfflinePageForOfflineURL(browser_context, offline_url);
   if (!offline_page)
     return;
 
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context);
   DCHECK(offline_page_model);
   offline_page_model->MarkPageAccessed(offline_page->offline_id);
 }
 
+// static
 const OfflinePageItem* OfflinePageUtils::GetOfflinePageFromWebContents(
     content::WebContents* web_contents) {
   OfflinePageTabHelper* tab_helper =
       OfflinePageTabHelper::FromWebContents(web_contents);
-  return tab_helper ? tab_helper->offline_page() : nullptr;
+  if (!tab_helper)
+    return nullptr;
+  const OfflinePageItem* offline_page = tab_helper->offline_page();
+  if (!offline_page)
+    return nullptr;
+
+  // Returns the cached offline page only if the offline URL matches with
+  // current tab URL (skipping fragment identifier part). This is to prevent
+  // from returning the wrong offline page if DidStartNavigation is never called
+  // to clear it up.
+  GURL::Replacements remove_params;
+  remove_params.ClearRef();
+  GURL offline_url = offline_page->url.ReplaceComponents(remove_params);
+  GURL web_contents_url =
+      web_contents->GetVisibleURL().ReplaceComponents(remove_params);
+  return offline_url == web_contents_url ? offline_page : nullptr;
 }
 
 // static
+const OfflinePageHeader* OfflinePageUtils::GetOfflineHeaderFromWebContents(
+    content::WebContents* web_contents) {
+  OfflinePageTabHelper* tab_helper =
+      OfflinePageTabHelper::FromWebContents(web_contents);
+  return tab_helper ? &(tab_helper->offline_header()) : nullptr;
+}
+
+// static
 bool OfflinePageUtils::GetTabId(content::WebContents* web_contents,
                                 int* tab_id) {
   TabAndroid* tab_android = TabAndroid::FromWebContents(web_contents);
   if (!tab_android)
     return false;
   *tab_id = tab_android->GetAndroidId();
   return true;
 }
 
 }  // namespace offline_pages