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

components/offline_pages/offline_page_item.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 "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 {
 
 namespace {
 const int kCurrentVersion = 1;
 }
 
 OfflinePageItem::OfflinePageItem()
     : version(kCurrentVersion),
       file_size(0),
       access_count(0),
       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)
     : 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),
       access_count(0),
       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),
       creation_time(creation_time),
       last_access_time(creation_time),
       access_count(0),
       flags(NO_FLAG) {}
 
 OfflinePageItem::~OfflinePageItem() {
 }
 
 GURL OfflinePageItem::GetOfflineURL() const {
   return net::FilePathToFileURL(file_path);
 }
 
 bool OfflinePageItem::IsMarkedForDeletion() const {
   return (static_cast<int>(flags) & MARKED_FOR_DELETION) != 0;
 }
 
 void OfflinePageItem::MarkForDeletion() {
   flags = static_cast<Flags>(static_cast<int>(flags) | MARKED_FOR_DELETION);
 }
 
 void OfflinePageItem::ClearMarkForDeletion() {
   flags = static_cast<Flags>(static_cast<int>(flags) & ~MARKED_FOR_DELETION);
 }
 
 }  // namespace offline_pages