[Offline Pages] Expanding event logger to be used by harness.

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

 // 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_array.h"
 #include "base/android/jni_string.h"
@@ skipping 29 matching lines @@
 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 {
+const char kNativeTag[] = "OPNative";
 
 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),
@@ skipping 147 matching lines @@
     RequestCoordinator* request_coordinator)
     : browser_context_(browser_context),
       offline_page_model_(offline_page_model),
       request_coordinator_(request_coordinator) {
   java_ref_.Reset(Java_OfflinePageEvaluationBridge_create(
       env, reinterpret_cast<jlong>(this)));
 
   NotifyIfDoneLoading();
   offline_page_model_->AddObserver(this);
   request_coordinator_->AddObserver(this);
+  offline_page_model->GetLogger()->SetClient(this);

[fgorski, 2016/11/30 17:30:47]

be consistent with filed vs. parameter usage. (see 2 lines above)

[romax, 2016/12/01 01:47:52]

Done.
Not sure what you meant but my guess is that I wasn't using offline_page_model_.
If so it's fixed.

+  request_coordinator->GetLogger()->SetClient(this);

[fgorski, 2016/11/30 17:30:47]

chili@:
I think what we are missing is the ability to swap loggers.
Setting a client on the logger is compensating for it...

romax@:
You don't have to make changes related to this comment in this patch.

[romax, 2016/12/01 01:47:52]

I think a broader vision should be when OfflinePageModel and RequestCoordinator
moves under one single hood of service which would owns the client policy
controller (and maybe the logger) it would be much easier to swap logger?

[fgorski, 2016/12/01 21:42:52]

It's still doesn't solve the problem of having to set client on the logger.

 }
 
 OfflinePageEvaluationBridge::~OfflinePageEvaluationBridge() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_OfflinePageEvaluationBridge_offlinePageEvaluationBridgeDestroyed(
       env, java_ref_);
 }
 
 // Implement OfflinePageModel::Observer
 void OfflinePageEvaluationBridge::OfflinePageModelLoaded(
@@ skipping 24 matching lines @@
       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::CustomLog(const std::string& message) {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_OfflinePageEvaluationBridge_log(env, java_ref_,
+                                       ConvertUTF8ToJavaString(env, kNativeTag),
+                                       ConvertUTF8ToJavaString(env, message));
+}
+
 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_obj);
   ScopedJavaGlobalRef<jobject> j_callback_ref(j_callback_obj);
@@ skipping 57 matching lines @@
 
 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