[Android WebView] Implement a better OnReceivedError callback

android_webview/browser/aw_request_interceptor.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_request_interceptor.h"
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_web_resource_response.h"
 #include "base/android/jni_string.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 18 matching lines @@
 } // namespace
 
 AwRequestInterceptor::AwRequestInterceptor() {
 }
 
 AwRequestInterceptor::~AwRequestInterceptor() {
 }
 
 scoped_ptr<AwWebResourceResponse>
 AwRequestInterceptor::QueryForAwWebResourceResponse(
-    const GURL& location,
     net::URLRequest* request) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   int render_process_id, render_frame_id;
   if (!ResourceRequestInfo::GetRenderFrameForRequest(
       request, &render_process_id, &render_frame_id))
     return scoped_ptr<AwWebResourceResponse>();
 
   scoped_ptr<AwContentsIoThreadClient> io_thread_client =
       AwContentsIoThreadClient::FromID(render_process_id, render_frame_id);
 
   if (!io_thread_client.get())
     return scoped_ptr<AwWebResourceResponse>();
 
-  return io_thread_client->ShouldInterceptRequest(location, request).Pass();
+  return io_thread_client->ShouldInterceptRequest(request).Pass();
 }
 
 net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // See if we've already found out the aw_web_resource_response for this
   // request.
   // This is done not only for efficiency reasons, but also for correctness
   // as it is possible for the Interceptor chain to be invoked more than once
   // in which case we don't want to query the embedder multiple times.
   // Note: The Interceptor chain is not invoked more than once if we create a
   // URLRequestJob in this method, so this is only caching negative hits.
   if (request->GetUserData(kRequestAlreadyQueriedDataKey))
     return NULL;
   request->SetUserData(kRequestAlreadyQueriedDataKey,
                        new base::SupportsUserData::Data());
 
   scoped_ptr<AwWebResourceResponse> aw_web_resource_response =
-      QueryForAwWebResourceResponse(request->url(), request);
+      QueryForAwWebResourceResponse(request);
 
   if (!aw_web_resource_response)
     return NULL;
 
   // The newly created job will own the AwWebResourceResponse.
   return AwWebResourceResponse::CreateJobFor(
       aw_web_resource_response.Pass(), request, network_delegate);
 }
 
 } // namespace android_webview