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

chrome/browser/android/offline_pages/offline_page_bridge.h

Index: chrome/browser/android/offline_pages/offline_page_bridge.h
diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.h b/chrome/browser/android/offline_pages/offline_page_bridge.h
index c588a3a034be58cadd3af2f711cc850c04ca1318..09934dce63394c651734b71ecdd9f5426954c569 100644
--- a/chrome/browser/android/offline_pages/offline_page_bridge.h
+++ b/chrome/browser/android/offline_pages/offline_page_bridge.h
@@ -33,7 +33,7 @@ class OfflinePageBridge : public OfflinePageModel::Observer {
   // OfflinePageModel::Observer implementation.
   void OfflinePageModelLoaded(OfflinePageModel* model) override;
   void OfflinePageModelChanged(OfflinePageModel* model) override;
-  void OfflinePageDeleted(int64_t bookmark_id) override;
+  void OfflinePageDeleted(int64_t offline_id) override;
 
   void GetAllPages(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
@@ -43,10 +43,16 @@ class OfflinePageBridge : public OfflinePageModel::Observer {
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& j_result_obj);
 
-  base::android::ScopedJavaLocalRef<jobject> GetPageByBookmarkId(
+  base::android::ScopedJavaLocalRef<jlongArray> GetOfflineIdsForClientId(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      jlong bookmark_id);
+      const base::android::JavaParamRef<jstring>& client_id_namespace,

[fgorski, 2016/02/26 19:29:22]

nit: j_client_id_namespace

[bburns, 2016/02/27 00:48:19]

Done.

+      const base::android::JavaParamRef<jstring>& client_id);

[fgorski, 2016/02/26 19:29:22]

nit: ditto

[bburns, 2016/02/27 00:48:19]

Done.

+
+  base::android::ScopedJavaLocalRef<jobject> GetPageByOfflineId(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobject>& obj,
+      jlong offline_id);
 
   base::android::ScopedJavaLocalRef<jobject> GetPageByOnlineURL(
       JNIEnv* env,
@@ -57,22 +63,23 @@ class OfflinePageBridge : public OfflinePageModel::Observer {
                 const base::android::JavaParamRef<jobject>& obj,
                 const base::android::JavaParamRef<jobject>& j_callback_obj,
                 const base::android::JavaParamRef<jobject>& j_web_contents,
-                jlong bookmark_id);
+                const base::android::JavaParamRef<jstring>& client_id_namespace,

[fgorski, 2016/02/26 19:29:22]

nit: ditto

[bburns, 2016/02/27 00:48:19]

Done.

+                const base::android::JavaParamRef<jstring>& client_id);

[fgorski, 2016/02/26 19:29:22]

nit: ditto

[bburns, 2016/02/27 00:48:19]

Done.

 
   void MarkPageAccessed(JNIEnv* env,
                         const base::android::JavaParamRef<jobject>& obj,
-                        jlong bookmark_id);
+                        jlong offline_id);
 
   void DeletePage(JNIEnv* env,
                   const base::android::JavaParamRef<jobject>& obj,
                   const base::android::JavaParamRef<jobject>& j_callback_obj,
-                  jlong bookmark_id);
+                  jlong offline_id);
 
   void DeletePages(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& j_callback_obj,
-      const base::android::JavaParamRef<jlongArray>& bookmark_ids_array);
+      const base::android::JavaParamRef<jlongArray>& offline_ids_array);

[fgorski, 2016/02/26 19:29:22]

nit: ditto.


Notice I skipped the jlongs, as they are usable in the C++ code.

[bburns, 2016/02/27 00:48:19]

Done.

 
   void CheckMetadataConsistency(
       JNIEnv* env,