Java side of purging BookmarkId from offline pages

chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java

Index: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java
index cbc4c31e494d290182793623aaf624c504602c94..7d1128e54269339f54d3fc1b8667430829602f98 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageItem.java
@@ -5,25 +5,26 @@
 package org.chromium.chrome.browser.offlinepages;
 
 import org.chromium.base.VisibleForTesting;
-import org.chromium.components.bookmarks.BookmarkId;
-import org.chromium.components.bookmarks.BookmarkType;
 
 /**
  * Simple object representing an offline page.
  */
 public class OfflinePageItem {
     private final String mUrl;
-    private final BookmarkId mBookmarId;
+    private final long mOfflineId;
+    private final ClientId mClientId;
     private final String mOfflineUrl;
     private final long mFileSize;
     private final long mCreationTimeMs;
     private final int mAccessCount;
     private final long mLastAccessTimeMs;
 
-    public OfflinePageItem(String url, long bookmarkId, String offlineUrl, long fileSize,
-            long creationTimeMs, int accessCount, long lastAccessTimeMs) {
+    public OfflinePageItem(String url, long offlineId, String clientNamespace, String clientId,
+            String offlineUrl, long fileSize, long creationTimeMs, int accessCount,
+            long lastAccessTimeMs) {
         mUrl = url;
-        mBookmarId = new BookmarkId(bookmarkId, BookmarkType.NORMAL);
+        mOfflineId = offlineId;
+        mClientId = new ClientId(clientNamespace, clientId);
         mOfflineUrl = offlineUrl;
         mFileSize = fileSize;
         mCreationTimeMs = creationTimeMs;
@@ -37,10 +38,16 @@ public class OfflinePageItem {
         return mUrl;
     }
 
-    /** @return Bookmark Id related to the offline page. */
+    /** @return offline id for this offline page. */
     @VisibleForTesting

[fgorski, 2016/02/29 18:42:29]

nit: you can likely remove all the @visibleForTesting now that we use all of it
in production code... unless we don't.

I don't think you need to add the tag to getClientId below.

[bburns, 2016/02/29 21:41:23]

Done.
 
Done.

-    public BookmarkId getBookmarkId() {
-        return mBookmarId;
+    public long getOfflineId() {
+        return mOfflineId;
+    }
+
+    /** @return Client Id related to the offline page. */
+    @VisibleForTesting
+    public ClientId getClientId() {
+        return mClientId;
     }
 
     /** @return Path to the offline copy of the page. */