Refactor the offline page storage to include client namespace and id.

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/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.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 "content/public/browser/browser_context.h"
 #include "url/gurl.h"
 
@@ skipping 79 matching lines @@
 
 // static
 int64_t OfflinePageUtils::GetBookmarkIdForOfflineURL(
     content::BrowserContext* browser_context,
     const GURL& offline_url) {
   const offline_pages::OfflinePageItem* offline_page =
       GetOfflinePageForOfflineURL(browser_context, offline_url);
   if (!offline_page)
     return -1;
 
-  return offline_page->bookmark_id;
+  if (offline_page->client_id.name_space != offline_pages::BOOKMARK_NAMESPACE) {
+    return -1;
+  }
+
+  int64_t result;
+  if (base::StringToInt64(offline_page->client_id.id, &result)) {
+    return result;
+  }
+  return -1;
 }
 
 // static
 bool OfflinePageUtils::IsOfflinePage(content::BrowserContext* browser_context,
                                      const GURL& offline_url) {
   return GetOfflinePageForOfflineURL(browser_context, offline_url) != nullptr;
 }
 
 // static
 bool OfflinePageUtils::HasOfflinePageForOnlineURL(
@@ skipping 12 matching lines @@
   if (!offline_pages::IsOfflinePagesEnabled())
     return false;
 
   offline_pages::OfflinePageModel* offline_page_model =
       offline_pages::OfflinePageModelFactory::GetForBrowserContext(
           browser_context);
   return offline_page_model->HasOfflinePages();
 }
 
 }  // namespace offline_pages