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

components/offline_pages/offline_page_item.cc

Index: components/offline_pages/offline_page_item.cc
diff --git a/components/offline_pages/offline_page_item.cc b/components/offline_pages/offline_page_item.cc
index 2259c1fa4676b34856df8e70543de1a3c5be1d2d..ba79a6e1c347b592b704d1e6dbcb6d2e6c52d291 100644
--- a/components/offline_pages/offline_page_item.cc
+++ b/components/offline_pages/offline_page_item.cc
@@ -4,6 +4,7 @@
 
 #include "components/offline_pages/offline_page_item.h"
 
+#include "components/offline_pages/proto/offline_pages.pb.h"
 #include "net/base/filename_util.h"
 
 namespace offline_pages {
@@ -20,11 +21,14 @@ OfflinePageItem::OfflinePageItem()
 }
 
 OfflinePageItem::OfflinePageItem(const GURL& url,
-                                 int64_t bookmark_id,
+                                 int64_t offline_id,
+                                 const ClientId& client_id,
                                  const base::FilePath& file_path,
                                  int64_t file_size)
     : url(url),
-      bookmark_id(bookmark_id),
+      offline_id(offline_id),
+      client_id_namespace(client_id.space),
+      client_id(client_id.id),
       version(kCurrentVersion),
       file_path(file_path),
       file_size(file_size),
@@ -32,12 +36,15 @@ OfflinePageItem::OfflinePageItem(const GURL& url,
       flags(NO_FLAG) {}
 
 OfflinePageItem::OfflinePageItem(const GURL& url,
-                                 int64_t bookmark_id,
+                                 int64_t offline_id,
+                                 const ClientId& client_id,
                                  const base::FilePath& file_path,
                                  int64_t file_size,
                                  const base::Time& creation_time)
     : url(url),
-      bookmark_id(bookmark_id),
+      offline_id(offline_id),
+      client_id_namespace(client_id.space),
+      client_id(client_id.id),
       version(kCurrentVersion),
       file_path(file_path),
       file_size(file_size),