Remove redundant code from Android context menu native.

chrome/browser/ui/android/context_menu_helper.cc

 // Copyright 2013 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/ui/android/context_menu_helper.h"
 
 #include <stdint.h>
 
 #include <vector>
 
-#include "base/android/jni_android.h"
+#include "base/android/callback_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/android/download/download_controller_base.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/common/thumbnail_capturer.mojom.h"
 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/context_menu_params.h"
 #include "jni/ContextMenuHelper_jni.h"
 #include "jni/ContextMenuParams_jni.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "third_party/WebKit/public/web/WebContextMenuData.h"
 #include "ui/android/window_android.h"
 #include "ui/gfx/geometry/point.h"
 
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::JavaParamRef;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ContextMenuHelper);
 
-const int kShareImageMaxWidth = 2048;
-const int kShareImageMaxHeight = 2048;
-
 const char kDataReductionProxyPassthroughHeader[] =
     "Chrome-Proxy: pass-through\r\n";
 
 ContextMenuHelper::ContextMenuHelper(content::WebContents* web_contents)
     : web_contents_(web_contents), weak_factory_(this) {
   JNIEnv* env = base::android::AttachCurrentThread();
   java_obj_.Reset(
       env,
       Java_ContextMenuHelper_create(env, reinterpret_cast<long>(this)).obj());
   DCHECK(!java_obj_.is_null());
@@ skipping 63 matching lines @@
           ConvertUTF8ToJavaString(env, params.unfiltered_link_url.spec()),
           ConvertUTF8ToJavaString(env, params.src_url.spec()),
           ConvertUTF16ToJavaString(env, params.title_text),
           image_was_fetched_lo_fi,
           ConvertUTF8ToJavaString(env, sanitizedReferrer.spec()),
           params.referrer_policy, can_save);
 
   return jmenu_info;
 }
 
+base::android::ScopedJavaLocalRef<jobject>
+ContextMenuHelper::GetJavaWebContents(JNIEnv* env,
+                                      const JavaParamRef<jobject>& obj) {
+  return web_contents_->GetJavaWebContents();
+}
+
 void ContextMenuHelper::OnStartDownload(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jboolean jis_link,
     jboolean jis_data_reduction_proxy_enabled) {
   std::string headers;
   if (jis_data_reduction_proxy_enabled)
     headers = kDataReductionProxyPassthroughHeader;
 
   DownloadControllerBase::Get()->StartContextMenuDownload(
       context_menu_params_,
       web_contents_,
       jis_link,
       headers);
 }
 
 void ContextMenuHelper::SearchForImage(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
   if (!render_frame_host)
     return;
 
   CoreTabHelper::FromWebContents(web_contents_)->SearchByImageInNewTab(
       render_frame_host, context_menu_params_.src_url);
 }
 
-void ContextMenuHelper::ShareImage(JNIEnv* env,
-                                   const JavaParamRef<jobject>& obj) {
+void ContextMenuHelper::RetrieveImage(JNIEnv* env,
+                                      const JavaParamRef<jobject>& obj,
+                                      const JavaParamRef<jobject>& jcallback,
+                                      jint max_dimen_px) {
   content::RenderFrameHost* render_frame_host =
       content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
   if (!render_frame_host)
     return;
 
   chrome::mojom::ThumbnailCapturerPtr thumbnail_capturer;
   render_frame_host->GetRemoteInterfaces()->GetInterface(&thumbnail_capturer);
   // Bind the InterfacePtr into the callback so that it's kept alive until
   // there's either a connection error or a response.
   auto* thumbnail_capturer_proxy = thumbnail_capturer.get();
   thumbnail_capturer_proxy->RequestThumbnailForContextNode(
-      0, gfx::Size(kShareImageMaxWidth, kShareImageMaxHeight),
-      base::Bind(&ContextMenuHelper::OnShareImage, weak_factory_.GetWeakPtr(),
-                 base::Passed(&thumbnail_capturer)));
+      0, gfx::Size(max_dimen_px, max_dimen_px),
+      base::Bind(&ContextMenuHelper::OnRetrieveImage,
+                 weak_factory_.GetWeakPtr(), base::Passed(&thumbnail_capturer),
+                 base::android::ScopedJavaGlobalRef<jobject>(env, jcallback)));
 }
 
-void ContextMenuHelper::OnShareImage(
+void ContextMenuHelper::OnRetrieveImage(

[David Trainor- moved to gerrit, 2017/04/06 21:53:57]

Can this just be an anonymous namespace helper method in this cc file?  Then can
you get rid of the weak_factory_?  It looked like it was only used for this
thumbnail stuff?

[Ted C, 2017/04/07 17:09:37]

Done.

     chrome::mojom::ThumbnailCapturerPtr thumbnail_capturer,
+    const base::android::JavaRef<jobject>& jcallback,
     const std::vector<uint8_t>& thumbnail_data,
     const gfx::Size& original_size) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::FromWebContents(web_contents_);
-  if (!content_view_core)
-    return;
-
-  base::android::ScopedJavaLocalRef<jobject> jwindow_android(
-      content_view_core->GetWindowAndroid()->GetJavaObject());
-
-  if (jwindow_android.is_null())
-    return;
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jbyteArray> j_bytes =
-      base::android::ToJavaByteArray(env, thumbnail_data);
-
-  Java_ContextMenuHelper_onShareImageReceived(env, java_obj_, jwindow_android,
-                                              j_bytes);
-}
-
-// TODO(tedchoc): Unify RetrieveHeaderThumbnail and ShareImage.
-void ContextMenuHelper::RetrieveHeaderThumbnail(
-    JNIEnv* env,
-    const JavaParamRef<jobject>& obj,
-    jint j_max_size_px) {
-  content::RenderFrameHost* render_frame_host =
-      content::RenderFrameHost::FromID(render_process_id_, render_frame_id_);
-
-  if (!render_frame_host)
-    return;
-
-  chrome::mojom::ThumbnailCapturerPtr thumbnail_capturer;
-  render_frame_host->GetRemoteInterfaces()->GetInterface(&thumbnail_capturer);
-  // Bind the InterfacePtr into the callback so that it's kept alive until
-  // there's either a connection error or a response.
-  auto* thumbnail_capturer_proxy = thumbnail_capturer.get();
-  thumbnail_capturer_proxy->RequestThumbnailForContextNode(
-      0, gfx::Size(j_max_size_px, j_max_size_px),
-      base::Bind(&ContextMenuHelper::OnHeaderThumbnailReceived,
-                 weak_factory_.GetWeakPtr(),
-                 base::Passed(&thumbnail_capturer)));
-}
-
-void ContextMenuHelper::OnHeaderThumbnailReceived(
-    chrome::mojom::ThumbnailCapturerPtr thumbnail_capturer,
-    const std::vector<uint8_t>& thumbnail_data,
-    const gfx::Size& original_size) {
-  content::ContentViewCore* content_view_core =
-      content::ContentViewCore::FromWebContents(web_contents_);
-  if (!content_view_core)
-    return;
-
-  base::android::ScopedJavaLocalRef<jobject> jwindow_android(
-      content_view_core->GetWindowAndroid()->GetJavaObject());
-
-  if (jwindow_android.is_null())
-    return;
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  base::android::ScopedJavaLocalRef<jbyteArray> j_bytes =
-      base::android::ToJavaByteArray(env, thumbnail_data);
-
-  Java_ContextMenuHelper_onHeaderThumbnailReceived(env, java_obj_,
-                                                   jwindow_android, j_bytes);
+  base::android::RunCallbackAndroid(jcallback, thumbnail_data);
 }
 
 bool RegisterContextMenuHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }