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

chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc

Index: chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc b/chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc
index 3501f0edb254c6618772d783554ab72f2d4db786..cca13629255c5c0a19dc437d32abf51fc2618f4e 100644
--- a/chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc
+++ b/chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc
@@ -27,7 +27,7 @@ namespace offline_pages {
 namespace {
 
 const GURL kTestPageUrl("http://test.org/page1");
-const int64_t kTestPageBookmarkId = 1234;
+const ClientId kTestPageBookmarkId = ClientId(BOOKMARK_NAMESPACE, "1234");
 const int64_t kTestFileSize = 876543LL;
 
 class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
@@ -72,6 +72,8 @@ class OfflinePageTabHelperTest :
     return offline_page_tab_helper_;
   }
 
+  int64_t offline_id() const { return offline_id_; }
+
  private:
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
@@ -79,11 +81,14 @@ class OfflinePageTabHelperTest :
   scoped_ptr<OfflinePageTestArchiver> BuildArchiver(
       const GURL& url,
       const base::FilePath& file_name);
-  void OnSavePageDone(OfflinePageModel::SavePageResult result);
+  void OnSavePageDone(OfflinePageModel::SavePageResult result,
+                      int64_t offline_id);
 
   scoped_ptr<TestNetworkChangeNotifier> network_change_notifier_;
   OfflinePageTabHelper* offline_page_tab_helper_;  // Not owned.
 
+  int64_t offline_id_;
+
   DISALLOW_COPY_AND_ASSIGN(OfflinePageTabHelperTest);
 };
 
@@ -159,7 +164,9 @@ scoped_ptr<OfflinePageTestArchiver> OfflinePageTabHelperTest::BuildArchiver(
 }
 
 void OfflinePageTabHelperTest::OnSavePageDone(
-    OfflinePageModel::SavePageResult result) {
+    OfflinePageModel::SavePageResult result,
+    int64_t offline_id) {
+  offline_id_ = offline_id;
 }
 
 TEST_F(OfflinePageTabHelperTest, SwitchToOnlineFromOffline) {
@@ -167,7 +174,7 @@ TEST_F(OfflinePageTabHelperTest, SwitchToOnlineFromOffline) {
 
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context());
-  const OfflinePageItem* page = model->GetPageByBookmarkId(kTestPageBookmarkId);
+  const OfflinePageItem* page = model->GetPageByOfflineId(offline_id());
   GURL offline_url = page->GetOfflineURL();
   GURL online_url = page->url;
 
@@ -181,7 +188,7 @@ TEST_F(OfflinePageTabHelperTest, SwitchToOfflineFromOnline) {
 
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context());
-  const OfflinePageItem* page = model->GetPageByBookmarkId(kTestPageBookmarkId);
+  const OfflinePageItem* page = model->GetPageByOfflineId(offline_id());
   GURL offline_url = page->GetOfflineURL();
   GURL online_url = page->url;