base::Bind: Convert net::NetworkDelegate.

chrome/browser/extensions/extension_webrequest_api.cc

Index: chrome/browser/extensions/extension_webrequest_api.cc
diff --git a/chrome/browser/extensions/extension_webrequest_api.cc b/chrome/browser/extensions/extension_webrequest_api.cc
index 3c6bcca149284a3492d74a56065ffcf49aa3e422..014e6bed099b459b85405aeb48e79d3dbcaf2883 100644
--- a/chrome/browser/extensions/extension_webrequest_api.cc
+++ b/chrome/browser/extensions/extension_webrequest_api.cc
@@ -347,7 +347,7 @@ struct ExtensionWebRequestEventRouter::BlockedRequest {
   const net::BoundNetLog* net_log;
 
   // The callback to call when we get a response from all event handlers.
-  net::OldCompletionCallback* callback;
+  net::CompletionCallback callback;
 
   // If non-empty, this contains the new URL that the request will redirect to.
   // Only valid for OnBeforeRequest.
@@ -385,7 +385,6 @@ struct ExtensionWebRequestEventRouter::BlockedRequest {
         event(kInvalidEvent),
         num_handlers_blocking(0),
         net_log(NULL),
-        callback(NULL),
         new_url(NULL),
         request_headers(NULL),
         override_response_headers(NULL),
@@ -503,7 +502,7 @@ int ExtensionWebRequestEventRouter::OnBeforeRequest(
     void* profile,
     ExtensionInfoMap* extension_info_map,
     net::URLRequest* request,
-    net::OldCompletionCallback* callback,
+    const net::CompletionCallback& callback,
     GURL* new_url) {
   // TODO(jochen): Figure out what to do with events from the system context.
   if (!profile)
@@ -549,7 +548,7 @@ int ExtensionWebRequestEventRouter::OnBeforeSendHeaders(
     void* profile,
     ExtensionInfoMap* extension_info_map,
     net::URLRequest* request,
-    net::OldCompletionCallback* callback,
+    const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
   // TODO(jochen): Figure out what to do with events from the system context.
   if (!profile)
@@ -623,7 +622,7 @@ int ExtensionWebRequestEventRouter::OnHeadersReceived(
     void* profile,
     ExtensionInfoMap* extension_info_map,
     net::URLRequest* request,
-    net::OldCompletionCallback* callback,
+    const net::CompletionCallback& callback,
     net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers) {
   if (!profile)
@@ -1261,21 +1260,21 @@ void ExtensionWebRequestEventRouter::DecrementBlockCount(
         &event_log_entries);
 
     if (blocked_request.event == kOnBeforeRequest) {
-      CHECK(blocked_request.callback);
+      CHECK(!blocked_request.callback.is_null());
       helpers::MergeOnBeforeRequestResponses(
           blocked_request.response_deltas,
           blocked_request.new_url,
           &conflicting_extensions,
           &event_log_entries);
     } else if (blocked_request.event == kOnBeforeSendHeaders) {
-      CHECK(blocked_request.callback);
+      CHECK(!blocked_request.callback.is_null());
       helpers::MergeOnBeforeSendHeadersResponses(
           blocked_request.response_deltas,
           blocked_request.request_headers,
           &conflicting_extensions,
           &event_log_entries);
     } else if (blocked_request.event == kOnHeadersReceived) {
-      CHECK(blocked_request.callback);
+      CHECK(!blocked_request.callback.is_null());
       helpers::MergeOnHeadersReceivedResponses(
           blocked_request.response_deltas,
           blocked_request.original_response_headers.get(),
@@ -1283,7 +1282,7 @@ void ExtensionWebRequestEventRouter::DecrementBlockCount(
           &conflicting_extensions,
           &event_log_entries);
     } else if (blocked_request.event == kOnAuthRequired) {
-      CHECK(!blocked_request.callback);
+      CHECK(blocked_request.callback.is_null());
       CHECK(!blocked_request.auth_callback.is_null());
       credentials_set = helpers::MergeOnAuthRequiredResponses(
          blocked_request.response_deltas,
@@ -1316,14 +1315,14 @@ void ExtensionWebRequestEventRouter::DecrementBlockCount(
       request_time_tracker_->SetRequestRedirected(request_id);
     }
 
-    if (blocked_request.callback) {
+    if (!blocked_request.callback.is_null()) {
       // This triggers onErrorOccurred.
       int rv = canceled ? net::ERR_BLOCKED_BY_CLIENT : net::OK;
-      net::OldCompletionCallback* callback = blocked_request.callback;
+      net::CompletionCallback callback = blocked_request.callback;
       // Ensure that request is removed before callback because the callback
       // might trigger the next event.
       blocked_requests_.erase(request_id);
-      callback->Run(rv);
+      callback.Run(rv);
     } else if (!blocked_request.auth_callback.is_null()) {
       net::NetworkDelegate::AuthRequiredResponse response =
           net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;