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

extensions/browser/api/web_request/web_request_api.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 "extensions/browser/api/web_request/web_request_api.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 851 matching lines @@
   event_details->SetResponseHeaders(request, request->response_headers());
   event_details->SetResponseSource(request);
   event_details->SetString(keys::kRedirectUrlKey, new_location.spec());
 
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
 
 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;
   EventListeners listeners = GetMatchingListeners(
       browser_context, extension_info_map, keys::kOnResponseStartedEvent,
       request, &extra_info_spec);
   if (listeners.empty())
     return;
 
   std::unique_ptr<WebRequestEventDetails> event_details(
       CreateEventDetails(request, extra_info_spec));
   event_details->SetResponseHeaders(request, request->response_headers());
   event_details->SetResponseSource(request);
 
   DispatchEvent(browser_context, request, listeners, std::move(event_details));
 }
 
-// Deprecated.
-// TODO(maksims): Remove this.
-void ExtensionWebRequestEventRouter::OnResponseStarted(
-    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) {
+    net::URLRequest* request) {
   // 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
   // risk-free because the handler cannot modify the request now.
   if (!browser_context ||
       (WebRequestPermissions::HideRequest(extension_info_map, request) &&
        !WasSignaled(*request))) {
     return;
   }
 
   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));
 
   ClearPendingCallbacks(request);
 
   int extra_info_spec = 0;
   EventListeners listeners =
       GetMatchingListeners(browser_context, extension_info_map,
                            keys::kOnCompletedEvent, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
   std::unique_ptr<WebRequestEventDetails> event_details(
       CreateEventDetails(request, extra_info_spec));
   event_details->SetResponseHeaders(request, request->response_headers());
   event_details->SetResponseSource(request);
 
   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
   // risk-free because the handler cannot modify the request now.
   if (!browser_context ||
       (WebRequestPermissions::HideRequest(extension_info_map, request) &&
        !WasSignaled(*request))) {
     return;
   }
 
   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));
 
   ClearPendingCallbacks(request);
 
   int extra_info_spec = 0;
   EventListeners listeners = GetMatchingListeners(
       browser_context, extension_info_map,
       web_request::OnErrorOccurred::kEventName, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
   std::unique_ptr<WebRequestEventDetails> event_details(
       CreateEventDetails(request, extra_info_spec));
   if (started)
     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(
     void* browser_context,
     const net::URLRequest* request) {
   ClearPendingCallbacks(request);
 
   signaled_requests_.erase(request->identifier());
 
   request_time_tracker_->LogRequestEndTime(request->identifier(),
                                            base::Time::Now());
 }
@@ skipping 1265 matching lines @@
   RunWithValidation()->Execute();
 }
 
 ExtensionFunction::ResponseAction
 WebRequestHandlerBehaviorChangedFunction::Run() {
   helpers::ClearCacheOnNavigation();
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions