[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"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/OfflinePageBridge_jni.h"
 #include "net/base/filename_util.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 namespace offline_pages {
 namespace android {
 
 namespace {
 
-void SavePageCallback(ScopedJavaGlobalRef<jobject>* j_callback_obj,
+void SavePageCallback(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
                       const GURL& url,
                       OfflinePageModel::SavePageResult result) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_ptr(j_callback_obj);
-
   Java_SavePageCallback_onSavePageDone(
-      env, j_callback_ptr->obj(), static_cast<int>(result),
+      env, j_callback_obj.obj(), static_cast<int>(result),
       ConvertUTF8ToJavaString(env, url.spec()).obj());
 }
 
-void DeletePageCallback(ScopedJavaGlobalRef<jobject>* j_callback_obj,
+void DeletePageCallback(const 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_obj.obj(), static_cast<int>(result));
+}
 
-  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,
@@ skipping 16 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>();
 
   return Java_OfflinePageBridge_createOfflinePageItem(
       env, ConvertUTF8ToJavaString(env, offline_page.url.spec()).obj(),
       offline_page.bookmark_id,
       ConvertUTF8ToJavaString(env, offline_page.GetOfflineURL().spec()).obj(),
       offline_page.file_size);
 }
 
 void OfflinePageBridge::SavePage(JNIEnv* env,
                                  jobject obj,
                                  jobject j_callback_obj,
                                  jobject j_web_contents,
                                  jlong bookmark_id) {
   DCHECK(j_callback_obj);
   DCHECK(j_web_contents);
 
-  scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_obj_ptr(
-      new ScopedJavaGlobalRef<jobject>());
-  j_callback_obj_ptr->Reset(env, j_callback_obj);
+  ScopedJavaGlobalRef<jobject> j_callback_ref;

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

You could just use the two-arg constructor, instead of calling Reset:

  ScopedJavaGlobalRef<jobject> j_callback_ref(env, j_callback_obj)

Doesn't really matter either way, though.

+  j_callback_ref.Reset(env, j_callback_obj);
 
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(j_web_contents);
   GURL url(web_contents->GetLastCommittedURL());
 
   scoped_ptr<OfflinePageArchiver> archiver(
       new OfflinePageMHTMLArchiver(
           web_contents, GetDownloadsPath(browser_context_)));
 
   offline_page_model_->SavePage(
       url, bookmark_id, archiver.Pass(),
-      base::Bind(&SavePageCallback, j_callback_obj_ptr.release(), url));
+      base::Bind(&SavePageCallback, j_callback_ref, url));
 }
 
 void OfflinePageBridge::DeletePage(JNIEnv* env,
                                    jobject obj,
                                    jobject j_callback_obj,
                                    jlong bookmark_id) {
   DCHECK(j_callback_obj);
 
-  scoped_ptr<ScopedJavaGlobalRef<jobject>> j_callback_obj_ptr(
-      new ScopedJavaGlobalRef<jobject>());
-  j_callback_obj_ptr->Reset(env, j_callback_obj);
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
 
   offline_page_model_->DeletePageByBookmarkId(bookmark_id, base::Bind(
-      &DeletePageCallback, j_callback_obj_ptr.release()));
+      &DeletePageCallback, j_callback_ref));
+}
+
+void OfflinePageBridge::DeletePages(JNIEnv* env,
+                                    jobject obj,
+                                    jobject j_callback_obj,
+                                    jlongArray bookmark_ids_array) {
+  DCHECK(j_callback_obj);
+
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
+
+  std::vector<jlong> java_bookmark_ids;
+  base::android::JavaLongArrayToLongVector(env, bookmark_ids_array,
+                                           &java_bookmark_ids);
+
+  // Making sure arm64 compilation works. Arm64's int64 == long int and jlong is
+  // long long int, which are both 64-bit but incompatible with each other
+  // causing a compilation error.
+  std::vector<int64> bookmark_ids(java_bookmark_ids.begin(),
+                                  java_bookmark_ids.end());
+
+  offline_page_model_->DeletePagesByBookmarkId(
+      bookmark_ids,
+      base::Bind(&DeletePageCallback, j_callback_ref));
 }
 
 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 26 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