[Offline pages] Adding capability to free up space used by Offline pages

chrome/browser/android/offline_pages/offline_page_bridge.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/offline_pages/offline_page_bridge.h"
 
+#include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_mhtml_archiver.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "components/offline_pages/offline_page_feature.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/offline_page_model.h"
@@ skipping 29 matching lines @@
 void DeletePageCallback(ScopedJavaGlobalRef<jobject>* j_callback_obj,
                         OfflinePageModel::DeletePageResult result) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_ptr(j_callback_obj);
 
   Java_DeletePageCallback_onDeletePageDone(
       env, j_callback_ptr->obj(), static_cast<int>(result));
 }
 
+void ToJavaOfflinePageList(JNIEnv* env,
+                           jobject j_result_obj,
+                           const std::vector<OfflinePageItem>& offline_pages) {
+  for (const OfflinePageItem& offline_page : offline_pages) {
+    Java_OfflinePageBridge_createOfflinePageAndAddToList(
+        env, j_result_obj,
+        ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
+        offline_page.bookmark_id,
+        ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
+        offline_page.file_size);
+  }
+}
+
 }  // namespace
 
 static jboolean IsOfflinePagesEnabled(JNIEnv* env, jclass clazz) {
   return offline_pages::IsOfflinePagesEnabled();
 }
 
 OfflinePageBridge::OfflinePageBridge(JNIEnv* env,
                                      jobject obj,
                                      content::BrowserContext* browser_context)
     : weak_java_ref_(env, obj),
@@ skipping 14 matching lines @@
   NotifyIfDoneLoading();
 }
 
 void OfflinePageBridge::GetAllPages(JNIEnv* env,
                                     jobject obj,
                                     jobject j_result_obj) {
   DCHECK(offline_page_model_->is_loaded());
   DCHECK(j_result_obj);
   const std::vector<OfflinePageItem>& offline_pages =
       offline_page_model_->GetAllPages();
+  ToJavaOfflinePageList(env, j_result_obj, offline_pages);
+}
 
-  for (const OfflinePageItem& offline_page : offline_pages) {
-    Java_OfflinePageBridge_createOfflinePageAndAddToList(
-        env, j_result_obj,
-        ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
-        offline_page.bookmark_id,
-        ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
-        offline_page.file_size);
-  }
+void OfflinePageBridge::GetPagesToCleanUp(JNIEnv* env,
+                                          jobject obj,
+                                          jobject j_result_obj) {
+  DCHECK(offline_page_model_->is_loaded());
+  DCHECK(j_result_obj);
+  const std::vector<OfflinePageItem>& offline_pages =
+      offline_page_model_->GetPagesToCleanUp();
+  ToJavaOfflinePageList(env, j_result_obj, offline_pages);
 }
 
 ScopedJavaLocalRef<jobject> OfflinePageBridge::GetPageByBookmarkId(
     JNIEnv* env,
     jobject obj,
     jlong bookmark_id) {
   OfflinePageItem offline_page;
   if (!offline_page_model_->GetPageByBookmarkId(bookmark_id, &offline_page))
     return ScopedJavaLocalRef<jobject>();
 
@@ skipping 36 matching lines @@
   DCHECK(j_callback_obj);
 
   scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_obj_ptr(
       new ScopedJavaGlobalRef<jobject>());
   j_callback_obj_ptr->Reset(env, j_callback_obj);
 
   offline_page_model_->DeletePageByBookmarkId(bookmark_id, base::Bind(
       &DeletePageCallback, j_callback_obj_ptr.release()));
 }
 
+void OfflinePageBridge::DeletePages(JNIEnv* env,
+                                    jobject obj,
+                                    jobject j_callback_obj,
+                                    jlongArray bookmark_ids_array) {
+  DCHECK(j_callback_obj);
+
+  scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_obj_ptr(

[newt (away), 2015/08/24 22:37:08]

Don't wrap ScopedJavaGlobalRef in a scoped_ptr. Just use ScopedJavaGlobalRef.
Please fix the other occurrences of this in this file.

[fgorski, 2015/08/25 18:25:25]

Done.

[newt (away), 2015/08/27 03:13:27]

Thanks for this cleanup.

+      new ScopedJavaGlobalRef<jobject>());
+  j_callback_obj_ptr->Reset(env, j_callback_obj);
+
+  std::vector<int64> bookmark_ids;
+  base::android::JavaLongArrayToLongVector(env, bookmark_ids_array,
+                                           &bookmark_ids);
+
+  offline_page_model_->DeletePagesByBookmarkId(
+      bookmark_ids,
+      base::Bind(&DeletePageCallback, j_callback_obj_ptr.release()));
+}
+
 void OfflinePageBridge::NotifyIfDoneLoading() const {
   if (!offline_page_model_->is_loaded())
     return;
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = weak_java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_OfflinePageBridge_offlinePageModelLoaded(env, obj.obj());
 }
 
@@ skipping 24 matching lines @@
   return reinterpret_cast<jlong>(new OfflinePageBridge(
       env, obj, ProfileAndroid::FromProfileAndroid(j_profile)));
 }
 
 bool RegisterOfflinePageBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace offline_pages