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

components/offline_pages/offline_page_metadata_store_impl_unittest.cc

Index: components/offline_pages/offline_page_metadata_store_impl_unittest.cc
diff --git a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
index 412ae2a85df09ead999cee536c315f56ad710f5a..1494137c670575bdd0074031a5abae645408d0ae 100644
--- a/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
+++ b/components/offline_pages/offline_page_metadata_store_impl_unittest.cc
@@ -145,7 +145,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, AddOfflinePage) {
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page.url, offline_pages_[0].url);
-  EXPECT_EQ(offline_page.bookmark_id, offline_pages_[0].bookmark_id);
+  EXPECT_EQ(offline_page.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);
@@ -181,7 +181,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, RemoveOfflinePage) {
 
   // Remove the offline page.
   std::vector<int64_t> ids_to_remove;
-  ids_to_remove.push_back(offline_page.bookmark_id);
+  ids_to_remove.push_back(offline_page.offline_id);
   store->RemoveOfflinePages(
       ids_to_remove,
       base::Bind(&OfflinePageMetadataStoreImplTest::UpdateCallback,
@@ -252,7 +252,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, AddRemoveMultipleOfflinePages) {
 
   // Remove the offline page.
   std::vector<int64_t> ids_to_remove;
-  ids_to_remove.push_back(offline_page_1.bookmark_id);
+  ids_to_remove.push_back(offline_page_1.offline_id);
   store->RemoveOfflinePages(
       ids_to_remove,
       base::Bind(&OfflinePageMetadataStoreImplTest::UpdateCallback,
@@ -274,7 +274,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, AddRemoveMultipleOfflinePages) {
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page_2.url, offline_pages_[0].url);
-  EXPECT_EQ(offline_page_2.bookmark_id, offline_pages_[0].bookmark_id);
+  EXPECT_EQ(offline_page_2.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page_2.version, offline_pages_[0].version);
   EXPECT_EQ(offline_page_2.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page_2.file_size, offline_pages_[0].file_size);
@@ -308,7 +308,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, UpdateOfflinePage) {
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page.url, offline_pages_[0].url);
-  EXPECT_EQ(offline_page.bookmark_id, offline_pages_[0].bookmark_id);
+  EXPECT_EQ(offline_page.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);
@@ -336,7 +336,7 @@ TEST_F(OfflinePageMetadataStoreImplTest, UpdateOfflinePage) {
   EXPECT_EQ(STATUS_TRUE, last_status_);
   EXPECT_EQ(1U, offline_pages_.size());
   EXPECT_EQ(offline_page.url, offline_pages_[0].url);
-  EXPECT_EQ(offline_page.bookmark_id, offline_pages_[0].bookmark_id);
+  EXPECT_EQ(offline_page.offline_id, offline_pages_[0].offline_id);
   EXPECT_EQ(offline_page.version, offline_pages_[0].version);
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);