Revert of Adjust callers and networking delegates in extensions/ to modified APIs

extensions/browser/api/web_request/web_request_api.cc

Index: extensions/browser/api/web_request/web_request_api.cc
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index 0967315916de7b04a33d6f848c02b0527d320dd8..dbfea31b3dffd7ed1692a044aa908b2c61668001 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -869,15 +869,12 @@
 void ExtensionWebRequestEventRouter::OnResponseStarted(
     void* browser_context,
     const InfoMap* extension_info_map,
-    net::URLRequest* request,
-    int net_error) {
-  DCHECK_NE(net::ERR_IO_PENDING, net_error);
-
+    net::URLRequest* request) {
   if (ShouldHideEvent(browser_context, extension_info_map, request))
     return;
 
   // OnResponseStarted is even triggered, when the request was cancelled.
-  if (net_error != net::OK)
+  if (request->status().status() != net::URLRequestStatus::SUCCESS)
     return;
 
   int extra_info_spec = 0;
@@ -895,21 +892,10 @@
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
 
-// Deprecated.
-// TODO(maksims): Remove this.
-void ExtensionWebRequestEventRouter::OnResponseStarted(
+void ExtensionWebRequestEventRouter::OnCompleted(
     void* browser_context,
     const InfoMap* extension_info_map,
     net::URLRequest* request) {
-  OnResponseStarted(browser_context, extension_info_map, request,
-                    request->status().error());
-}
-
-void ExtensionWebRequestEventRouter::OnCompleted(
-    void* browser_context,
-    const InfoMap* extension_info_map,
-    net::URLRequest* request,
-    int net_error) {
   // We hide events from the system context as well as sensitive requests.
   // However, if the request first became sensitive after redirecting we have
   // already signaled it and thus we have to signal the end of it. This is
@@ -923,7 +909,7 @@
   request_time_tracker_->LogRequestEndTime(request->identifier(),
                                            base::Time::Now());
 
-  DCHECK_EQ(net::OK, net_error);
+  DCHECK(request->status().status() == net::URLRequestStatus::SUCCESS);
 
   DCHECK(!GetAndSetSignaled(request->identifier(), kOnCompleted));
 
@@ -944,22 +930,11 @@
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
 
-// Deprecated.
-// TODO(maksims): Remove this.
-void ExtensionWebRequestEventRouter::OnCompleted(
-    void* browser_context,
-    const InfoMap* extension_info_map,
-    net::URLRequest* request) {
-  OnCompleted(browser_context, extension_info_map, request,
-              request->status().error());
-}
-
 void ExtensionWebRequestEventRouter::OnErrorOccurred(
     void* browser_context,
     const InfoMap* extension_info_map,
     net::URLRequest* request,
-    bool started,
-    int net_error) {
+    bool started) {
   // We hide events from the system context as well as sensitive requests.
   // However, if the request first became sensitive after redirecting we have
   // already signaled it and thus we have to signal the end of it. This is
@@ -973,8 +948,8 @@
   request_time_tracker_->LogRequestEndTime(request->identifier(),
                                            base::Time::Now());
 
-  DCHECK_NE(net::OK, net_error);
-  DCHECK_NE(net::ERR_IO_PENDING, net_error);
+  DCHECK(request->status().status() == net::URLRequestStatus::FAILED ||
+         request->status().status() == net::URLRequestStatus::CANCELED);
 
   DCHECK(!GetAndSetSignaled(request->identifier(), kOnErrorOccurred));
 
@@ -993,18 +968,10 @@
     event_details->SetResponseSource(request);
   else
     event_details->SetBoolean(keys::kFromCache, request->was_cached());
-  event_details->SetString(keys::kErrorKey, net::ErrorToString(net_error));
+  event_details->SetString(keys::kErrorKey,
+                           net::ErrorToString(request->status().error()));
 
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
-}
-
-void ExtensionWebRequestEventRouter::OnErrorOccurred(
-    void* browser_context,
-    const InfoMap* extension_info_map,
-    net::URLRequest* request,
-    bool started) {
-  OnErrorOccurred(browser_context, extension_info_map, request, started,
-                  request->status().error());
 }
 
 void ExtensionWebRequestEventRouter::OnURLRequestDestroyed(