android: Remove CleanupReference from CookiesFetcher

chrome/browser/android/cookies/cookies_fetcher.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 "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "chrome/browser/android/cookies/cookies_fetcher.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "jni/CookiesFetcher_jni.h"
 #include "net/cookies/cookie_store.h"
 #include "net/url_request/url_request_context.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 CookiesFetcher::CookiesFetcher(JNIEnv* env, jobject obj, Profile* profile) {
 }
 
 CookiesFetcher::~CookiesFetcher() {
 }
 
-void CookiesFetcher::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
-  delete this;
-}
-
 void CookiesFetcher::PersistCookies(JNIEnv* env,
                                     const JavaParamRef<jobject>& obj) {
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
   if (!profile->HasOffTheRecordProfile()) {
     // There is no work to be done. We might consider calling
     // the Java callback if needed.
     return;
   }
   profile = profile->GetOffTheRecordProfile();
 
@@ skipping 14 matching lines @@
 
 void CookiesFetcher::PersistCookiesInternal(
     net::URLRequestContextGetter* getter) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   net::CookieStore* store = getter->GetURLRequestContext()->cookie_store();
 
   // Nullable sometimes according to docs. There is no work need to be done
   // but we can consider calling the Java callback with empty output.
   if (!store) {
-    jobject_.Reset();
+    delete this;
     return;
   }
 
-  store->GetAllCookiesAsync(base::Bind(
-      &CookiesFetcher::OnCookiesFetchFinished, base::Unretained(this)));
+  store->GetAllCookiesAsync(
+      base::Bind(&CookiesFetcher::OnCookiesFetchFinished, base::Owned(this)));

[gone, 2016/08/29 18:07:53]

What destroys the object on this path?  It seems to run through
OnCookiesFetchedFinished() and not try to delete itself.

[boliu, 2016/08/29 18:53:45]

It's owned and so deleted by the callback. Look up base::Owned :p

[gone, 2016/08/29 18:55:01]

Sorry, I don't do many native code reviews :P

 }
 
 void CookiesFetcher::OnCookiesFetchFinished(const net::CookieList& cookies) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   ScopedJavaLocalRef<jobjectArray> joa =
       Java_CookiesFetcher_createCookiesArray(env, jobject_, cookies.size());
 
   int index = 0;
   for (net::CookieList::const_iterator i = cookies.begin();
       i != cookies.end(); ++i) {
     std::string domain = i->Domain();
     if (domain.length() > 1 && domain[0] == '.')
       domain = domain.substr(1);
     ScopedJavaLocalRef<jobject> java_cookie = Java_CookiesFetcher_createCookie(
         env, jobject_, base::android::ConvertUTF8ToJavaString(env, i->Name()),
         base::android::ConvertUTF8ToJavaString(env, i->Value()),
         base::android::ConvertUTF8ToJavaString(env, i->Domain()),
         base::android::ConvertUTF8ToJavaString(env, i->Path()),
         i->CreationDate().ToInternalValue(), i->ExpiryDate().ToInternalValue(),
         i->LastAccessDate().ToInternalValue(), i->IsSecure(), i->IsHttpOnly(),
         static_cast<int>(i->SameSite()), i->Priority());
     env->SetObjectArrayElement(joa.obj(), index++, java_cookie.obj());
   }
 
   Java_CookiesFetcher_onCookieFetchFinished(env, jobject_, joa);
-
-  // Give up the reference.
-  jobject_.Reset();
 }
 
 static void RestoreToCookieJarInternal(net::URLRequestContextGetter* getter,
                                        const net::CanonicalCookie& cookie) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   net::CookieStore* store = getter->GetURLRequestContext()->cookie_store();
 
   // Nullable sometimes according to docs.
   if (!store) {
@@ skipping 69 matching lines @@
 
 // JNI functions
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new CookiesFetcher(env, obj, 0));
 }
 
 // Register native methods
 bool RegisterCookiesFetcher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }