Support getting offline pages also by original URL

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"
@@ skipping 12 matching lines @@
 #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 {
 
-void OnGetPagesByOnlineURLDone(
+void OnGetPagesByURLDone(
+    const GURL& url,
+    bool search_by_final_url_only,
     int tab_id,
     const std::vector<std::string>& namespaces_to_show_in_original_tab,
     const base::Callback<void(const OfflinePageItem*)>& callback,
     const MultipleOfflinePageItemResult& pages) {
-  const OfflinePageItem* selected_page = nullptr;
+  const OfflinePageItem* selected_page_for_final_url = nullptr;
+  const OfflinePageItem* selected_page_for_original_url = nullptr;
   std::string tab_id_str = base::IntToString(tab_id);
 
-  for (const auto& offline_page : pages) {
+  for (const auto& page : pages) {
     auto result = std::find(namespaces_to_show_in_original_tab.begin(),
                             namespaces_to_show_in_original_tab.end(),
-                            offline_page.client_id.name_space);
+                            page.client_id.name_space);
     if (result != namespaces_to_show_in_original_tab.end() &&
-        offline_page.client_id.id != tab_id_str) {
+        page.client_id.id != tab_id_str) {
       continue;
     }
 
-    if (!selected_page ||
-        offline_page.creation_time > selected_page->creation_time) {
-      selected_page = &offline_page;
+    if (OfflinePageUtils::EqualsIgnoringFragment(url, page.url)) {
+      if (!selected_page_for_final_url ||
+          page.creation_time > selected_page_for_final_url->creation_time) {
+        selected_page_for_final_url = &page;
+      }
+    } else {
+      DCHECK(!search_by_final_url_only);
+      DCHECK(url == page.original_url);

[fgorski, 2016/11/16 23:43:46]

what about the fragment here?
Why is there no symmetry with the code above?

[jianli, 2016/11/17 01:12:14]

With more thought, I decided to change to do match without fragment for original
url.

+      if (!selected_page_for_original_url ||
+          page.creation_time > selected_page_for_original_url->creation_time) {
+        selected_page_for_original_url = &page;
+      }
     }
   }
-  callback.Run(selected_page);
+
+  // Match for final URL should take high priority than matching for original
+  // URL.
+  callback.Run(selected_page_for_final_url ? selected_page_for_final_url
+                                           : selected_page_for_original_url);
 }
 
 }  // namespace
 
 // static
-void OfflinePageUtils::SelectPageForOnlineURL(
+void OfflinePageUtils::SelectPageForURL(
     content::BrowserContext* browser_context,
-    const GURL& online_url,
+    const GURL& url,
+    bool search_by_final_url_only,
     int tab_id,
     const base::Callback<void(const OfflinePageItem*)>& callback) {
   OfflinePageModel* offline_page_model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context);
   if (!offline_page_model) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, nullptr));
     return;
   }
 
-  offline_page_model->GetPagesByOnlineURL(
-      online_url, base::Bind(&OnGetPagesByOnlineURLDone, tab_id,
-                             offline_page_model->GetPolicyController()
-                                 ->GetNamespacesRestrictedToOriginalTab(),
-                             callback));
+  offline_page_model->GetPagesByURL(
+      url,
+      search_by_final_url_only,
+      base::Bind(&OnGetPagesByURLDone, url, search_by_final_url_only, tab_id,
+                 offline_page_model->GetPolicyController()
+                     ->GetNamespacesRestrictedToOriginalTab(),
+                 callback));
 }
 
 const OfflinePageItem* OfflinePageUtils::GetOfflinePageFromWebContents(
     content::WebContents* web_contents) {
   OfflinePageTabHelper* tab_helper =
       OfflinePageTabHelper::FromWebContents(web_contents);
   if (!tab_helper)
     return nullptr;
   const OfflinePageItem* offline_page = tab_helper->offline_page();
   if (!offline_page)
@@ skipping 51 matching lines @@
                          const std::vector<OfflinePageItem>& pages) {
     for (auto& page : pages) {
       if (page.client_id.name_space == name_space) {
         callback.Run(true);
         return;
       }
     }
     callback.Run(false);
   };
 
-  offline_page_model->GetPagesByOnlineURL(
-      offline_page_url, base::Bind(continuation, name_space, callback));
+  offline_page_model->GetPagesByURL(
+      offline_page_url,
+      true /* search_by_final_url_only */,
+      base::Bind(continuation, name_space, callback));
 }
 
 // static
 void OfflinePageUtils::CheckExistenceOfRequestsWithURL(
     content::BrowserContext* browser_context,
     const std::string name_space,
     const GURL& offline_page_url,
     const base::Callback<void(bool)>& callback) {
   RequestCoordinator* request_coordinator =
       RequestCoordinatorFactory::GetForBrowserContext(browser_context);
@@ skipping 23 matching lines @@
   GURL::Replacements remove_params;
   remove_params.ClearRef();
 
   GURL lhs_stripped = lhs.ReplaceComponents(remove_params);
   GURL rhs_stripped = lhs.ReplaceComponents(remove_params);
 
   return lhs_stripped == rhs_stripped;
 }
 
 }  // namespace offline_pages