Tell java side when the native auth handler is gone

android_webview/browser/aw_login_delegate.cc

 // Copyright (c) 2012 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 "android_webview/browser/aw_login_delegate.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 38 matching lines @@
         static_cast<UrlRequestAuthAttemptsData*>(
             request->GetUserData(kAuthAttemptsKey));
 
     if (count == NULL) {
       count = new UrlRequestAuthAttemptsData();
       request->SetUserData(kAuthAttemptsKey, count);
     }
 
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&AwLoginDelegate::HandleHttpAuthRequestOnUIThread,
-                   make_scoped_refptr(this), (count->auth_attempts_ == 0)));
+                   this, (count->auth_attempts_ == 0)));
     count->auth_attempts_++;
 }
 
 AwLoginDelegate::~AwLoginDelegate() {
+  // The Auth handler holds a ref count back on |this| object, so it should be
+  // impossible to reach here while this object still owns an auth handler.
+  DCHECK(aw_http_auth_handler_ == NULL);
 }
 
 void AwLoginDelegate::Proceed(const string16& user,
                               const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&AwLoginDelegate::ProceedOnIOThread,
-                 make_scoped_refptr(this), user, password));
+                 this, user, password));
 }
 
 void AwLoginDelegate::Cancel() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
-      base::Bind(&AwLoginDelegate::CancelOnIOThread,
-                 make_scoped_refptr(this)));
+      base::Bind(&AwLoginDelegate::CancelOnIOThread, this));
 }
 
 void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
     bool first_auth_attempt) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create(
       this, auth_info_, first_auth_attempt));
 
   RenderViewHost* render_view_host = RenderViewHost::FromID(
       render_process_id_, render_view_id_);
   if (!render_view_host) {
     Cancel();
     return;
   }
 
   WebContents* web_contents = WebContents::FromRenderViewHost(
       render_view_host);
   aw_http_auth_handler_->HandleOnUIThread(web_contents);
 }
 
 void AwLoginDelegate::CancelOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request_) {
     request_->CancelAuth();
     ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
+    request_ = NULL;
   }
+  DeleteAuthHandlerSoon();
 }
 
 void AwLoginDelegate::ProceedOnIOThread(const string16& user,
                                         const string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request_) {
     request_->SetAuth(net::AuthCredentials(user, password));
     ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
+    request_ = NULL;
   }
+  DeleteAuthHandlerSoon();
 }
 
 void AwLoginDelegate::OnRequestCancelled() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   request_ = NULL;
+  DeleteAuthHandlerSoon();
+}
+
+void AwLoginDelegate::DeleteAuthHandlerSoon() {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+        base::Bind(&AwLoginDelegate::DeleteAuthHandlerSoon, this));
+    return;
+  }
   aw_http_auth_handler_.reset();
 }
 
 }  // namespace android_webview