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..722156acc2e6ae7d988c0ebf662eb9ad209fd0cf 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 {
+  // The namespace for the id (of course 'namespace' is a reserved word, so...)
+  std::string name_space;

[fgorski, 2016/02/23 17:15:30]

that earlier namespace comment should be here.

[bburns, 2016/02/23 19:25:38]

which comment?

+  // 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.

[fgorski, 2016/02/23 17:15:30]

If it is internal, does that mean we don't share it outside of the internals of
offline pages?

(I'd be happy with that, but please consider updating the documentation if that
is not the case.

[bburns, 2016/02/23 19:25:38]

Done.

+  int64_t offline_id;
+
+  // The Client ID (external) related to the offline page.
+  std::string client_id_name_space;

[fgorski, 2016/02/23 17:15:30]

why not just hold ClientId here?

[bburns, 2016/02/23 19:25:38]

Done.

(historical note, it was from before when the object was from a proto and you
couldn't forward declare it..)

+  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.