Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHostDelegate. These short-circuited cancelling the prerendering on the IO thread. Instead, I moved cancelling the prerender on the UI thread since both of these calls end up going to the UI thread right after.

This also removes the last calls of ResourceRequestInfo::GetAssociatedRenderView, which I will remove in a followup.

BUG=304341
R=davidben@chromium.org

Review URL: https://codereview.chromium.org/124113003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243184 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 25 deletions

diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index 195d79a..4a42764 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -290,25 +290,6 @@ void AwResourceDispatcherHostDelegate::DownloadStarting(
   }
 }
 
-bool AwResourceDispatcherHostDelegate::AcceptAuthRequest(
-    net::URLRequest* request,
-    net::AuthChallengeInfo* auth_info) {
-  return true;
-}
-
-bool AwResourceDispatcherHostDelegate::AcceptSSLClientCertificateRequest(
-    net::URLRequest* request,
-    net::SSLCertRequestInfo* cert_info) {
-  // WebView does not support client certificate selection, however it does
-  // send a no-certificate response to the server to allow it decide how to
-  // proceed. The base class returns false here, which causes the entire
-  // resource request to be abort. We don't want that, so we must return true
-  // here (and subsequently complete the request in
-  // AwContentBrowserClient::SelectClientCertificate) to get the intended
-  // behavior.
-  return true;
-}
-
 content::ResourceDispatcherHostLoginDelegate*
     AwResourceDispatcherHostDelegate::CreateLoginDelegate(
         net::AuthChallengeInfo* auth_info,
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
index d669ff7..e584c40 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h
@@ -46,12 +46,6 @@ class AwResourceDispatcherHostDelegate
       bool is_content_initiated,
       bool must_download,
       ScopedVector<content::ResourceThrottle>* throttles) OVERRIDE;
-  virtual bool AcceptAuthRequest(net::URLRequest* request,
-                                 net::AuthChallengeInfo* auth_info) OVERRIDE;
-  virtual bool AcceptSSLClientCertificateRequest(
-      net::URLRequest* request,
-      net::SSLCertRequestInfo* cert_info) OVERRIDE;
-
   virtual content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info,
       net::URLRequest* request) OVERRIDE;