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

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

Index: chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
index 53951d59b73b55631135f0389d999eb62b2d1b4f..9d7e60ff24b65adcf6bc63a5d772af7ab7a72aaf 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/offlinepages/OfflinePageBridge.java
@@ -222,6 +222,16 @@ public final class OfflinePageBridge {
     }
 
     /**
+     * @return A list of all offline ids that match a particular
+     * (namespace, client_id)
+     */
+    public long[] getOfflineIdsForClientId(String clientIdNamespace, String clientId) {

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

Looking at all the other methods in this class, and across chromium codebase,
this should be a Set<Long>.

It should still be fine to get an array from native side, but you should wrap it
in a collection here.

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

Done.

+        assert mIsNativeOfflinePageModelLoaded;
+        return nativeGetOfflineIdsForClientId(mNativeOfflinePageBridge, clientIdNamespace,
+            clientId);
+    }
+
+    /**
      * Gets an offline page associated with a provided bookmark ID.
      *
      * @param bookmarkId Id of the bookmark associated with an offline page.
@@ -229,7 +239,7 @@ public final class OfflinePageBridge {
      * exist.
      */
     public OfflinePageItem getPageByBookmarkId(BookmarkId bookmarkId) {

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

It bothers me that we are not converting the bookmarkId to the offline page ID
here properly. At least add a todo. And we have quite a few places in this file
with the same problem.

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

Ok, I fixed that here.

-        return nativeGetPageByBookmarkId(mNativeOfflinePageBridge, bookmarkId.getId());
+        return nativeGetPageByOfflineId(mNativeOfflinePageBridge, bookmarkId.getId());
     }
 
     /**
@@ -276,7 +286,8 @@ public final class OfflinePageBridge {
         };
         recordFreeSpaceHistograms(
                 "OfflinePages.SavePage.FreeSpacePercentage", "OfflinePages.SavePage.FreeSpaceMB");
-        nativeSavePage(mNativeOfflinePageBridge, callbackWrapper, webContents, bookmarkId.getId());
+        nativeSavePage(mNativeOfflinePageBridge, callbackWrapper, webContents, bookmarkId.getId(),
+                "bookmark", Long.toString(bookmarkId.getId()));
     }
 
     /**
@@ -407,8 +418,8 @@ public final class OfflinePageBridge {
     }
 
     @CalledByNative
-    private void offlinePageDeleted(long bookmarkId) {
-        BookmarkId id = new BookmarkId(bookmarkId, BookmarkType.NORMAL);
+    private void offlinePageDeleted(long offlineId) {
+        BookmarkId id = new BookmarkId(offlineId, BookmarkType.NORMAL);
         for (OfflinePageModelObserver observer : mObservers) {
             observer.offlinePageDeleted(id);
         }
@@ -416,19 +427,19 @@ public final class OfflinePageBridge {
 
     @CalledByNative
     private static void createOfflinePageAndAddToList(List<OfflinePageItem> offlinePagesList,
-            String url, long bookmarkId, String offlineUrl, long fileSize, long creationTime,
+            String url, long offlineId, String offlineUrl, long fileSize, long creationTime,
             int accessCount, long lastAccessTimeMs) {
         offlinePagesList.add(createOfflinePageItem(
-                url, bookmarkId, offlineUrl, fileSize, creationTime, accessCount,
+                url, offlineId, offlineUrl, fileSize, creationTime, accessCount,
                 lastAccessTimeMs));
     }
 
     @CalledByNative
-    private static OfflinePageItem createOfflinePageItem(String url, long bookmarkId,
+    private static OfflinePageItem createOfflinePageItem(String url, long offlineId,
             String offlineUrl, long fileSize, long creationTime, int accessCount,
             long lastAccessTimeMs) {
         return new OfflinePageItem(
-                url, bookmarkId, offlineUrl, fileSize, creationTime, accessCount, lastAccessTimeMs);
+                url, offlineId, offlineUrl, fileSize, creationTime, accessCount, lastAccessTimeMs);
     }
 
     private static native int nativeGetFeatureMode();
@@ -438,17 +449,19 @@ public final class OfflinePageBridge {
     private native void nativeDestroy(long nativeOfflinePageBridge);
     private native void nativeGetAllPages(
             long nativeOfflinePageBridge, List<OfflinePageItem> offlinePages);
-    private native OfflinePageItem nativeGetPageByBookmarkId(
-            long nativeOfflinePageBridge, long bookmarkId);
+    private native long[] nativeGetOfflineIdsForClientId(
+            long nativeOfflinePageBridge, String clientNamespace, String clientId);
+    private native OfflinePageItem nativeGetPageByOfflineId(
+            long nativeOfflinePageBridge, long offlineId);
     private native OfflinePageItem nativeGetPageByOnlineURL(
             long nativeOfflinePageBridge, String onlineURL);
     private native void nativeSavePage(long nativeOfflinePageBridge, SavePageCallback callback,
-            WebContents webContents, long bookmarkId);
-    private native void nativeMarkPageAccessed(long nativeOfflinePageBridge, long bookmarkId);
+            WebContents webContents, long offlineId, String clientNamespace, String clientId);
+    private native void nativeMarkPageAccessed(long nativeOfflinePageBridge, long offlineId);
     private native void nativeDeletePage(long nativeOfflinePageBridge,
-            DeletePageCallback callback, long bookmarkId);
+            DeletePageCallback callback, long offlineId);
     private native void nativeDeletePages(
-            long nativeOfflinePageBridge, DeletePageCallback callback, long[] bookmarkIds);
+            long nativeOfflinePageBridge, DeletePageCallback callback, long[] offlineIds);
     private native void nativeGetPagesToCleanUp(
             long nativeOfflinePageBridge, List<OfflinePageItem> offlinePages);
     private native void nativeCheckMetadataConsistency(long nativeOfflinePageBridge);