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

components/offline_pages/offline_page_item.h

Index: components/offline_pages/offline_page_item.h
diff --git a/components/offline_pages/offline_page_item.h b/components/offline_pages/offline_page_item.h
index a7bf8c8fa1d3f9424aa941d2f64d3e98e63e5ab0..8476a49154fecc800ca2eb09e418477db09863ea 100644
--- a/components/offline_pages/offline_page_item.h
+++ b/components/offline_pages/offline_page_item.h
@@ -16,6 +16,13 @@
 
 namespace offline_pages {
 
+struct ClientId {

[dewittj, 2016/02/22 19:23:16]

To me this name is a little confusing, it seems like it's the id for a given
client but in fact it's an ID that is namespaced by client.  Is there another
name that doesn't have this problem?

[bburns, 2016/02/22 21:02:31]

This is the best I could come up with, I'm open to other names...

+  // The namespace for the id (of course 'namespace' is a reserved word, so...)
+  std::string space;

[dewittj, 2016/02/22 19:23:16]

maybe name_space is a better option here.

[bburns, 2016/02/22 21:02:31]

Done.

+  // The id in the client's namespace.  Opaque to us.
+  std::string id;
+};
+
 // Metadata of the offline page.
 struct OfflinePageItem {
  public:
@@ -27,11 +34,13 @@ struct 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);
   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);
@@ -50,8 +59,13 @@ struct OfflinePageItem {
 
   // The URL of the page.
   GURL url;
-  // The Bookmark ID related to the offline page.
-  int64_t bookmark_id;
+  // The Offline (internal) ID related to the offline page.
+  int64_t offline_id;
+
+  // The Client ID (external) related to the offline page.
+  std::string client_id_namespace;

[dewittj, 2016/02/22 19:23:16]

if you rename ClientId.space -> ClientId.name_space then this should also get an
underscore.

[bburns, 2016/02/22 21:02:31]

Done.

+  std::string client_id;
+
   // Version of the offline page item.
   int version;
   // The file path to the archive with a local copy of the page.