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

chrome/browser/android/offline_pages/offline_page_bridge.cc

Index: chrome/browser/android/offline_pages/offline_page_bridge.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_bridge.cc b/chrome/browser/android/offline_pages/offline_page_bridge.cc
index 716403c09ba54c529e2eb42b0da7a4f9fd50ae0c..4669c2c715657e6aa63e79c0a2a6adaebe9df887 100644
--- a/chrome/browser/android/offline_pages/offline_page_bridge.cc
+++ b/chrome/browser/android/offline_pages/offline_page_bridge.cc
@@ -16,6 +16,7 @@
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
+#include "components/offline_pages/proto/offline_pages.pb.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/OfflinePageBridge_jni.h"
@@ -56,7 +57,7 @@ void ToJavaOfflinePageList(JNIEnv* env,
     Java_OfflinePageBridge_createOfflinePageAndAddToList(
         env, j_result_obj,
         ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
-        offline_page.bookmark_id,
+        offline_page.offline_id,
         ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
         offline_page.file_size,
         offline_page.creation_time.ToJavaTime(),
@@ -108,12 +109,12 @@ void OfflinePageBridge::OfflinePageModelChanged(OfflinePageModel* model) {
   Java_OfflinePageBridge_offlinePageModelChanged(env, obj.obj());
 }
 
-void OfflinePageBridge::OfflinePageDeleted(int64_t bookmark_id) {
+void OfflinePageBridge::OfflinePageDeleted(int64_t offline_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
-  Java_OfflinePageBridge_offlinePageDeleted(env, obj.obj(), bookmark_id);
+  Java_OfflinePageBridge_offlinePageDeleted(env, obj.obj(), offline_id);
 }
 
 void OfflinePageBridge::GetAllPages(JNIEnv* env,
@@ -137,12 +138,28 @@ void OfflinePageBridge::GetPagesToCleanUp(
   ToJavaOfflinePageList(env, j_result_obj, offline_pages);
 }
 
-ScopedJavaLocalRef<jobject> OfflinePageBridge::GetPageByBookmarkId(
+ScopedJavaLocalRef<jlongArray> OfflinePageBridge::GetOfflineIdsForClientId(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
-    jlong bookmark_id) {
+    const JavaParamRef<jstring>& client_id_namespace,
+    const JavaParamRef<jstring>& client_id) {
+  DCHECK(offline_page_model_->is_loaded());
+  offline_pages::ClientId cid;
+  cid.space = ConvertJavaStringToUTF8(env, client_id_namespace);
+  cid.id = ConvertJavaStringToUTF8(env, client_id);
+
+  std::vector<int64_t> results = offline_page_model_->GetOfflineIdsForClientId(
+      cid);
+
+  return base::android::ToJavaLongArray(env, results);
+}
+
+ScopedJavaLocalRef<jobject> OfflinePageBridge::GetPageByOfflineId(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    jlong offline_id) {
   const OfflinePageItem* offline_page =
-      offline_page_model_->GetPageByBookmarkId(bookmark_id);
+      offline_page_model_->GetPageByOfflineId(offline_id);
   if (!offline_page)
     return ScopedJavaLocalRef<jobject>();
   return CreateOfflinePageItem(env, *offline_page);
@@ -163,7 +180,10 @@ void OfflinePageBridge::SavePage(JNIEnv* env,
                                  const JavaParamRef<jobject>& obj,
                                  const JavaParamRef<jobject>& j_callback_obj,
                                  const JavaParamRef<jobject>& j_web_contents,
-                                 jlong bookmark_id) {
+                                 jlong offline_id,
+                                 const JavaParamRef<jstring>&
+                                     client_id_namespace,
+                                 const JavaParamRef<jstring>& client_id) {
   DCHECK(j_callback_obj);
   DCHECK(j_web_contents);
 
@@ -177,27 +197,31 @@ void OfflinePageBridge::SavePage(JNIEnv* env,
   scoped_ptr<OfflinePageArchiver> archiver(
       new OfflinePageMHTMLArchiver(web_contents));
 
+  offline_pages::ClientId cid;
+  cid.space = ConvertJavaStringToUTF8(env, client_id_namespace);
+  cid.id = ConvertJavaStringToUTF8(env, client_id);
+
   offline_page_model_->SavePage(
-      url, bookmark_id, std::move(archiver),
+      url, offline_id, cid, std::move(archiver),
       base::Bind(&SavePageCallback, j_callback_ref, url));
 }
 
 void OfflinePageBridge::MarkPageAccessed(JNIEnv* env,
                                          const JavaParamRef<jobject>& obj,
-                                         jlong bookmark_id) {
-  offline_page_model_->MarkPageAccessed(bookmark_id);
+                                         jlong offline_id) {
+  offline_page_model_->MarkPageAccessed(offline_id);
 }
 
 void OfflinePageBridge::DeletePage(JNIEnv* env,
                                    const JavaParamRef<jobject>& obj,
                                    const JavaParamRef<jobject>& j_callback_obj,
-                                   jlong bookmark_id) {
+                                   jlong offline_id) {
   DCHECK(j_callback_obj);
 
   ScopedJavaGlobalRef<jobject> j_callback_ref;
   j_callback_ref.Reset(env, j_callback_obj);
 
-  offline_page_model_->DeletePageByBookmarkId(bookmark_id, base::Bind(
+  offline_page_model_->DeletePageByOfflineId(offline_id, base::Bind(
       &DeletePageCallback, j_callback_ref));
 }
 
@@ -205,18 +229,18 @@ void OfflinePageBridge::DeletePages(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& j_callback_obj,
-    const JavaParamRef<jlongArray>& bookmark_ids_array) {
+    const JavaParamRef<jlongArray>& offline_ids_array) {
   DCHECK(j_callback_obj);
 
   ScopedJavaGlobalRef<jobject> j_callback_ref;
   j_callback_ref.Reset(env, j_callback_obj);
 
-  std::vector<int64_t> bookmark_ids;
-  base::android::JavaLongArrayToInt64Vector(env, bookmark_ids_array,
-                                            &bookmark_ids);
+  std::vector<int64_t> offline_ids;
+  base::android::JavaLongArrayToInt64Vector(env, offline_ids_array,
+                                            &offline_ids);
 
-  offline_page_model_->DeletePagesByBookmarkId(
-      bookmark_ids,
+  offline_page_model_->DeletePagesByOfflineId(
+      offline_ids,
       base::Bind(&DeletePageCallback, j_callback_ref));
 }
 
@@ -261,7 +285,7 @@ ScopedJavaLocalRef<jobject> OfflinePageBridge::CreateOfflinePageItem(
     const OfflinePageItem& offline_page) const {
   return Java_OfflinePageBridge_createOfflinePageItem(
       env, ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
-      offline_page.bookmark_id,
+      offline_page.offline_id,
       ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
       offline_page.file_size,
       offline_page.creation_time.ToJavaTime(),