[Offline Pages] Added OfflinePageEvaluationBridge for testing.

chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc

Index: chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
diff --git a/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc b/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
new file mode 100644
index 0000000000000000000000000000000000000000..695c3a73b50c948b21394d7bfed826adb2bae29e
--- /dev/null
+++ b/chrome/browser/android/offline_pages/evaluation/offline_page_evaluation_bridge.cc
@@ -0,0 +1,220 @@
+// Copyright 2016 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/evaluation/offline_page_evaluation_bridge.h"
+
+#include "base/android/callback_android.h"
+#include "base/android/jni_android.h"
+#include "base/android/jni_string.h"
+#include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
+#include "chrome/browser/android/offline_pages/request_coordinator_factory.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_android.h"
+#include "components/offline_pages/background/request_coordinator.h"
+#include "components/offline_pages/background/request_notifier.h"
+#include "components/offline_pages/background/save_page_request.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 "jni/OfflinePageEvaluationBridge_jni.h"
+#include "jni/SavePageRequest_jni.h"
+
+using base::android::ConvertJavaStringToUTF8;
+using base::android::ConvertUTF8ToJavaString;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaGlobalRef;
+using base::android::ScopedJavaLocalRef;
+
+namespace offline_pages {
+namespace android {
+
+namespace {
+
+void ToJavaOfflinePageList(JNIEnv* env,
+                           jobject j_result_obj,
+                           const std::vector<OfflinePageItem>& offline_pages) {
+  for (const OfflinePageItem& offline_page : offline_pages) {
+    Java_OfflinePageEvaluationBridge_createOfflinePageAndAddToList(
+        env, j_result_obj,
+        ConvertUTF8ToJavaString(env, offline_page.url.spec()),
+        offline_page.offline_id,
+        ConvertUTF8ToJavaString(env, offline_page.client_id.name_space),
+        ConvertUTF8ToJavaString(env, offline_page.client_id.id),
+        ConvertUTF8ToJavaString(env, offline_page.file_path.value()),
+        offline_page.file_size, offline_page.creation_time.ToJavaTime(),
+        offline_page.access_count, offline_page.last_access_time.ToJavaTime());
+  }
+}
+
+ScopedJavaLocalRef<jobject> ToJavaSavePageRequest(
+    JNIEnv* env,
+    const SavePageRequest& request) {
+  return Java_SavePageRequest_create(
+      env, static_cast<int>(request.request_state()), request.request_id(),
+      ConvertUTF8ToJavaString(env, request.url().spec()),
+      ConvertUTF8ToJavaString(env, request.client_id().name_space),
+      ConvertUTF8ToJavaString(env, request.client_id().id));
+}
+
+void GetAllPagesCallback(
+    const ScopedJavaGlobalRef<jobject>& j_result_obj,
+    const ScopedJavaGlobalRef<jobject>& j_callback_obj,
+    const OfflinePageModel::MultipleOfflinePageItemResult& result) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ToJavaOfflinePageList(env, j_result_obj.obj(), result);
+  base::android::RunCallbackAndroid(j_callback_obj, j_result_obj);
+}
+
+void OnPushRequestsDone(const ScopedJavaGlobalRef<jobject>& j_callback_obj,
+                        bool result) {
+  base::android::RunCallbackAndroid(j_callback_obj, result);
+}
+
+}  // namespace
+
+static ScopedJavaLocalRef<jobject> GetBridgeForProfile(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& jcaller,
+    const JavaParamRef<jobject>& j_profile) {
+  Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
+
+  OfflinePageModel* offline_page_model =
+      OfflinePageModelFactory::GetForBrowserContext(profile);
+
+  RequestCoordinator* request_coordinator =
+      RequestCoordinatorFactory::GetForBrowserContext(profile);
+
+  if (offline_page_model == nullptr || request_coordinator == nullptr)
+    return ScopedJavaLocalRef<jobject>();
+
+  OfflinePageEvaluationBridge* bridge = new OfflinePageEvaluationBridge(
+      env, profile, offline_page_model, request_coordinator);
+
+  return ScopedJavaLocalRef<jobject>(bridge->java_ref());
+}
+
+// static
+bool OfflinePageEvaluationBridge::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
+OfflinePageEvaluationBridge::OfflinePageEvaluationBridge(
+    JNIEnv* env,
+    content::BrowserContext* browser_context,
+    OfflinePageModel* offline_page_model,
+    RequestCoordinator* request_coordinator)
+    : browser_context_(browser_context),
+      offline_page_model_(offline_page_model),
+      request_coordinator_(request_coordinator) {
+  ScopedJavaLocalRef<jobject> j_offline_page_evaluation_bridge =

[gone, 2016/10/13 17:56:58]

You should just be able to feed this to .Reset() below without creating another
ScopedJavaLocalRef<jobject>.

[romax, 2016/10/13 18:46:22]

Done.

+      Java_OfflinePageEvaluationBridge_create(env,
+                                              reinterpret_cast<jlong>(this));
+  java_ref_.Reset(j_offline_page_evaluation_bridge);
+
+  NotifyIfDoneLoading();
+  offline_page_model_->AddObserver(this);
+  request_coordinator_->AddObserver(this);
+}
+
+OfflinePageEvaluationBridge::~OfflinePageEvaluationBridge() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_offlinePageEvaluationBridgeDestroyed(
+      env, java_ref_);
+}
+
+// Implement OfflinePageModel::Observer
+void OfflinePageEvaluationBridge::OfflinePageModelLoaded(
+    OfflinePageModel* model) {
+  DCHECK_EQ(offline_page_model_, model);
+  NotifyIfDoneLoading();
+}
+
+void OfflinePageEvaluationBridge::OfflinePageModelChanged(
+    OfflinePageModel* model) {}
+
+void OfflinePageEvaluationBridge::OfflinePageDeleted(
+    int64_t offline_id,
+    const ClientId& client_id) {}
+
+// Implement RequestCoordinator::Observer
+void OfflinePageEvaluationBridge::OnAdded(const SavePageRequest& request) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_savePageRequestAdded(
+      env, java_ref_, ToJavaSavePageRequest(env, request));
+}
+
+void OfflinePageEvaluationBridge::OnCompleted(
+    const SavePageRequest& request,
+    RequestNotifier::BackgroundSavePageResult status) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_savePageRequestCompleted(
+      env, java_ref_, ToJavaSavePageRequest(env, request),
+      static_cast<int>(status));
+}
+
+void OfflinePageEvaluationBridge::OnChanged(const SavePageRequest& request) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_savePageRequestChanged(
+      env, java_ref_, ToJavaSavePageRequest(env, request));
+}
+
+void OfflinePageEvaluationBridge::GetAllPages(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jobject>& j_result_obj,
+    const JavaParamRef<jobject>& j_callback_obj) {
+  DCHECK(j_result_obj);
+  DCHECK(j_callback_obj);
+
+  ScopedJavaGlobalRef<jobject> j_result_ref;
+  j_result_ref.Reset(env, j_result_obj);

[gone, 2016/10/13 17:56:58]

One of the constructors for ScopedJavaGlobalRef does this for you; you use it
below in PushRequestProcessing.

[romax, 2016/10/13 18:46:23]

Done.

+
+  ScopedJavaGlobalRef<jobject> j_callback_ref;
+  j_callback_ref.Reset(env, j_callback_obj);
+
+  offline_page_model_->GetAllPages(
+      base::Bind(&GetAllPagesCallback, j_result_ref, j_callback_ref));
+}
+
+void OfflinePageEvaluationBridge::PushRequestProcessing(
+    JNIEnv* env,
+    const base::android::JavaParamRef<jobject>& obj,

[gone, 2016/10/13 17:56:59]

You're already "using" this; just remove base::android::

[romax, 2016/10/13 18:46:23]

Done.

+    const base::android::JavaParamRef<jobject>& j_callback_obj) {
+  ScopedJavaGlobalRef<jobject> j_callback_ref(j_callback_obj);
+  DCHECK(request_coordinator_);
+  base::android::RunCallbackAndroid(j_callback_obj, false);
+
+  net::NetworkChangeNotifier::ConnectionType connection =
+      net::NetworkChangeNotifier::GetConnectionType();
+  DeviceConditions device_conditions(false, 0, connection);
+  request_coordinator_->StartProcessing(
+      device_conditions, base::Bind(&OnPushRequestsDone, j_callback_ref));
+}
+
+void OfflinePageEvaluationBridge::SavePageLater(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& obj,
+    const JavaParamRef<jstring>& j_url,
+    const JavaParamRef<jstring>& j_namespace,
+    const JavaParamRef<jstring>& j_client_id,
+    jboolean user_requested) {
+  offline_pages::ClientId client_id;
+  client_id.name_space = ConvertJavaStringToUTF8(env, j_namespace);
+  client_id.id = ConvertJavaStringToUTF8(env, j_client_id);
+
+  request_coordinator_->SavePageLater(
+      GURL(ConvertJavaStringToUTF8(env, j_url)), client_id,
+      static_cast<bool>(user_requested),
+      RequestCoordinator::RequestAvailability::ENABLED_FOR_OFFLINER);
+}
+
+void OfflinePageEvaluationBridge::NotifyIfDoneLoading() const {
+  if (!offline_page_model_->is_loaded())
+    return;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_offlinePageModelLoaded(env, java_ref_);
+}
+
+}  // namespace android
+}  // namespace offline_pages