Pass JavaRef to WebContents::FromJavaWebContents.

chrome/browser/android/contextualsearch/contextual_search_manager.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/contextualsearch/contextual_search_manager.h"
 
 #include <set>
 
 #include "base/android/jni_string.h"
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ContextualSearchManager_jni.h"
 #include "net/url_request/url_fetcher_impl.h"
 #include "services/shell/public/cpp/interface_provider.h"
 #include "services/shell/public/cpp/interface_registry.h"
 
 using base::android::JavaParamRef;
+using base::android::JavaRef;
 using content::WebContents;
 
 // This class manages the native behavior of the Contextual Search feature.
 // Instances of this class are owned by the Java ContextualSearchManager.
 // Most of the work is actually done in an associated delegate to this class:
 // the ContextualSearchDelegate.
-ContextualSearchManager::ContextualSearchManager(JNIEnv* env, jobject obj) {
-  java_manager_.Reset(env, obj);
+ContextualSearchManager::ContextualSearchManager(JNIEnv* env,
+                                                 const JavaRef<jobject>& obj) {
+  java_manager_.Reset(obj);
   Java_ContextualSearchManager_setNativeManager(
       env, obj, reinterpret_cast<intptr_t>(this));
   Profile* profile = ProfileManager::GetActiveUserProfile();
   delegate_.reset(new ContextualSearchDelegate(
       profile->GetRequestContext(),
       TemplateURLServiceFactory::GetForProfile(profile),
       base::Bind(&ContextualSearchManager::OnSearchTermResolutionResponse,
                  base::Unretained(this)),
       base::Bind(&ContextualSearchManager::OnSurroundingTextAvailable,
                  base::Unretained(this)),
@@ skipping 12 matching lines @@
 }
 
 void ContextualSearchManager::StartSearchTermResolutionRequest(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_selection,
     jboolean j_use_resolved_search_term,
     const JavaParamRef<jobject>& j_base_web_contents,
     jboolean j_may_send_base_page_url) {
   WebContents* base_web_contents =
-      WebContents::FromJavaWebContents(j_base_web_contents.obj());
+      WebContents::FromJavaWebContents(j_base_web_contents);
   DCHECK(base_web_contents);
   std::string selection(
       base::android::ConvertJavaStringToUTF8(env, j_selection));
   bool use_resolved_search_term = j_use_resolved_search_term;
   bool may_send_base_page_url = j_may_send_base_page_url;
   // Calls back to OnSearchTermResolutionResponse.
   delegate_->StartSearchTermResolutionRequest(
       selection, use_resolved_search_term, base_web_contents,
       may_send_base_page_url);
 }
 
 void ContextualSearchManager::GatherSurroundingText(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jstring>& j_selection,
     jboolean j_use_resolved_search_term,
     const JavaParamRef<jobject>& j_base_web_contents,
     jboolean j_may_send_base_page_url) {
   WebContents* base_web_contents =
-      WebContents::FromJavaWebContents(j_base_web_contents.obj());
+      WebContents::FromJavaWebContents(j_base_web_contents);
   DCHECK(base_web_contents);
   std::string selection(
       base::android::ConvertJavaStringToUTF8(env, j_selection));
   bool use_resolved_search_term = j_use_resolved_search_term;
   bool may_send_base_page_url = j_may_send_base_page_url;
   delegate_->GatherAndSaveSurroundingText(selection, use_resolved_search_term,
                                           base_web_contents,
                                           may_send_base_page_url);
 }
 
@@ skipping 65 matching lines @@
   Java_ContextualSearchManager_onIcingSelectionAvailable(
       env, java_manager_, j_encoding, j_surrounding_text, start_offset,
       end_offset);
 }
 
 void ContextualSearchManager::EnableContextualSearchJsApiForOverlay(
     JNIEnv* env,
     jobject obj,
     const JavaParamRef<jobject>& j_overlay_web_contents) {
   WebContents* overlay_web_contents =
-      WebContents::FromJavaWebContents(j_overlay_web_contents.obj());
+      WebContents::FromJavaWebContents(j_overlay_web_contents);
   DCHECK(overlay_web_contents);
   // Tell our Overlay Notifier Service that this is currently a CS page.
   content::RenderFrameHost* render_frame_host =
       overlay_web_contents->GetRenderViewHost()->GetMainFrame();
   DCHECK(render_frame_host);
   contextual_search::mojom::OverlayPageNotifierServicePtr page_notifier_service;
   render_frame_host->GetRemoteInterfaces()->GetInterface(
       &page_notifier_service);
   DCHECK(page_notifier_service);
   page_notifier_service->NotifyIsContextualSearchOverlay();
@@ skipping 13 matching lines @@
 }
 
 void ContextualSearchManager::SetCaption(std::string caption,
                                          bool does_answer) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::ScopedJavaLocalRef<jstring> j_caption =
       base::android::ConvertUTF8ToJavaString(env, caption.c_str());
   Java_ContextualSearchManager_onSetCaption(env, java_manager_, j_caption,
                                             does_answer);
 }