android: Don't pass ScopedJavaGlobalRef pointers.

chrome/browser/android/feedback/connectivity_checker.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/feedback/connectivity_checker.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/location.h"
@@ skipping 23 matching lines @@
 // GENERATED_JAVA_PREFIX_TO_STRIP: CONNECTIVITY_CHECK_RESULT_
 enum ConnectivityCheckResult {
   CONNECTIVITY_CHECK_RESULT_UNKNOWN = 0,
   CONNECTIVITY_CHECK_RESULT_CONNECTED = 1,
   CONNECTIVITY_CHECK_RESULT_NOT_CONNECTED = 2,
   CONNECTIVITY_CHECK_RESULT_TIMEOUT = 3,
   CONNECTIVITY_CHECK_RESULT_ERROR = 4,
   CONNECTIVITY_CHECK_RESULT_END = 5
 };
 
-void ExecuteCallback(jobject callback, ConnectivityCheckResult result) {
+void ExecuteCallback(const base::android::JavaRef<jobject>& callback,
+                     ConnectivityCheckResult result) {
   CHECK(result >= CONNECTIVITY_CHECK_RESULT_UNKNOWN);
   CHECK(result < CONNECTIVITY_CHECK_RESULT_END);
   Java_ConnectivityChecker_executeCallback(base::android::AttachCurrentThread(),
                                            callback, result);
 }
 
-void ExecuteCallbackFromRef(
-    base::android::ScopedJavaGlobalRef<jobject>* callback,
-    ConnectivityCheckResult result) {
-  ExecuteCallback(callback->obj(), result);
-}
-
 void PostCallback(JNIEnv* env,
-                  jobject j_callback,
+                  const base::android::JavaRef<jobject>& j_callback,
                   ConnectivityCheckResult result) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE,
-      base::Bind(&ExecuteCallbackFromRef,
-                 base::Owned(new base::android::ScopedJavaGlobalRef<jobject>(
-                     env, j_callback)),
+      base::Bind(&ExecuteCallback,
+                 base::android::ScopedJavaGlobalRef<jobject>(j_callback),
                  result));
 }
 
 // A utility class for checking if the device is currently connected to the
 // Internet.
 class ConnectivityChecker : public net::URLFetcherDelegate {
  public:
   ConnectivityChecker(Profile* profile,
                       const GURL& url,
                       const base::TimeDelta& timeout,
@@ skipping 37 matching lines @@
   if (is_being_destroyed_)
     return;
   is_being_destroyed_ = true;
 
   DCHECK_EQ(url_fetcher_.get(), source);
   net::URLRequestStatus status = source->GetStatus();
   int response_code = source->GetResponseCode();
 
   bool connected = status.is_success() && response_code == net::HTTP_NO_CONTENT;
   if (connected) {
-    ExecuteCallback(java_callback_.obj(), CONNECTIVITY_CHECK_RESULT_CONNECTED);
+    ExecuteCallback(java_callback_, CONNECTIVITY_CHECK_RESULT_CONNECTED);
   } else {
-    ExecuteCallback(java_callback_.obj(),
-                    CONNECTIVITY_CHECK_RESULT_NOT_CONNECTED);
+    ExecuteCallback(java_callback_, CONNECTIVITY_CHECK_RESULT_NOT_CONNECTED);
   }
 
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 ConnectivityChecker::ConnectivityChecker(
     Profile* profile,
     const GURL& url,
     const base::TimeDelta& timeout,
     const base::android::JavaRef<jobject>& java_callback)
@@ skipping 21 matching lines @@
   expiration_timer_.reset(new base::OneShotTimer());
   expiration_timer_->Start(FROM_HERE, timeout_, this,
                            &ConnectivityChecker::OnTimeout);
 }
 
 void ConnectivityChecker::OnTimeout() {
   if (is_being_destroyed_)
     return;
   is_being_destroyed_ = true;
   url_fetcher_.reset();
-  ExecuteCallback(java_callback_.obj(), CONNECTIVITY_CHECK_RESULT_TIMEOUT);
+  ExecuteCallback(java_callback_, CONNECTIVITY_CHECK_RESULT_TIMEOUT);
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 }  // namespace
 
 void CheckConnectivity(JNIEnv* env,
                        const JavaParamRef<jclass>& clazz,
                        const JavaParamRef<jobject>& j_profile,
                        const JavaParamRef<jstring>& j_url,
                        jlong j_timeout_ms,
@@ skipping 22 matching lines @@
   GURL url(base::android::ConvertJavaStringToUTF8(env, j_url));
   return url.is_valid();
 }
 
 bool RegisterConnectivityChecker(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome