Adjust callers and networking delegates in extensions/ to modified APIs

extensions/shell/browser/shell_network_delegate.cc

 // Copyright 2014 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 "extensions/shell/browser/shell_network_delegate.h"
 
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 58 matching lines @@
       allowed_unsafe_redirect_url);
 }
 
 void ShellNetworkDelegate::OnBeforeRedirect(
     net::URLRequest* request,
     const GURL& new_location) {
   ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRedirect(
       browser_context_, extension_info_map_.get(), request, new_location);
 }
 
-
-void ShellNetworkDelegate::OnResponseStarted(
-    net::URLRequest* request) {
+void ShellNetworkDelegate::OnResponseStarted(net::URLRequest* request,
+                                             int net_error) {
   ExtensionWebRequestEventRouter::GetInstance()->OnResponseStarted(
-      browser_context_, extension_info_map_.get(), request);
+      browser_context_, extension_info_map_.get(), request, net_error);
 }
 
-void ShellNetworkDelegate::OnCompleted(
-    net::URLRequest* request,
-    bool started) {
-  if (request->status().status() == net::URLRequestStatus::SUCCESS) {
+void ShellNetworkDelegate::OnCompleted(net::URLRequest* request,
+                                       bool started,
+                                       int net_error) {
+  DCHECK_NE(net::ERR_IO_PENDING, net_error);
+
+  if (net_error == net::OK) {
     bool is_redirect = request->response_headers() &&
         net::HttpResponseHeaders::IsRedirectResponseCode(
             request->response_headers()->response_code());
     if (!is_redirect) {
       ExtensionWebRequestEventRouter::GetInstance()->OnCompleted(
-          browser_context_, extension_info_map_.get(), request);
+          browser_context_, extension_info_map_.get(), request, net_error);
     }
-    return;
+  } else {
+    ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred(
+        browser_context_, extension_info_map_.get(), request, started,
+        net_error);
   }
-
-  if (request->status().status() == net::URLRequestStatus::FAILED ||
-      request->status().status() == net::URLRequestStatus::CANCELED) {
-    ExtensionWebRequestEventRouter::GetInstance()->OnErrorOccurred(
-        browser_context_, extension_info_map_.get(), request, started);
-    return;
-  }
-
-  NOTREACHED();
 }
 
 void ShellNetworkDelegate::OnURLRequestDestroyed(
     net::URLRequest* request) {
   ExtensionWebRequestEventRouter::GetInstance()->OnURLRequestDestroyed(
       browser_context_, request);
 }
 
 void ShellNetworkDelegate::OnPACScriptError(
     int line_number,
     const base::string16& error) {
 }
 
 net::NetworkDelegate::AuthRequiredResponse
 ShellNetworkDelegate::OnAuthRequired(
     net::URLRequest* request,
     const net::AuthChallengeInfo& auth_info,
     const AuthCallback& callback,
     net::AuthCredentials* credentials) {
   return ExtensionWebRequestEventRouter::GetInstance()->OnAuthRequired(
       browser_context_, extension_info_map_.get(), request, auth_info, callback,
       credentials);
 }
 
 }  // namespace extensions