base::Bind: Convert net::NetworkDelegate.

net/base/network_delegate.cc

 // Copyright (c) 2011 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 "net/base/network_delegate.h"
 
 #include "base/logging.h"
 
 namespace net {
 
-int NetworkDelegate::NotifyBeforeURLRequest(URLRequest* request,
-                                            OldCompletionCallback* callback,
-                                            GURL* new_url) {
+int NetworkDelegate::NotifyBeforeURLRequest(
+    URLRequest* request, const net::CompletionCallback& callback,

[csilv, 2011/11/30 21:56:50]

same comment as header (re: already in net namespace)

[James Hawkins, 2011/12/01 00:40:26]

Done.

+    GURL* new_url) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
-  DCHECK(callback);
+  DCHECK(!callback.is_null());
   return OnBeforeURLRequest(request, callback, new_url);
 }
 
-int NetworkDelegate::NotifyBeforeSendHeaders(URLRequest* request,
-                                             OldCompletionCallback* callback,
-                                             HttpRequestHeaders* headers) {
+int NetworkDelegate::NotifyBeforeSendHeaders(
+    URLRequest* request, const net::CompletionCallback& callback,
+    HttpRequestHeaders* headers) {
   DCHECK(CalledOnValidThread());
   DCHECK(headers);
-  DCHECK(callback);
+  DCHECK(!callback.is_null());
   return OnBeforeSendHeaders(request, callback, headers);
 }
 
 void NetworkDelegate::NotifySendHeaders(URLRequest* request,
                                         const HttpRequestHeaders& headers) {
   DCHECK(CalledOnValidThread());
   OnSendHeaders(request, headers);
 }
 
 int NetworkDelegate::NotifyHeadersReceived(
     URLRequest* request,
-    OldCompletionCallback* callback,
+    const net::CompletionCallback& callback,
     HttpResponseHeaders* original_response_headers,
     scoped_refptr<HttpResponseHeaders>* override_response_headers) {
   DCHECK(CalledOnValidThread());
   DCHECK(original_response_headers);
-  DCHECK(callback);
+  DCHECK(!callback.is_null());
   return OnHeadersReceived(request, callback, original_response_headers,
                            override_response_headers);
 }
 
 void NetworkDelegate::NotifyResponseStarted(URLRequest* request) {
   DCHECK(CalledOnValidThread());
   DCHECK(request);
   OnResponseStarted(request);
 }
 
@@ skipping 31 matching lines @@
 NetworkDelegate::AuthRequiredResponse NetworkDelegate::NotifyAuthRequired(
     URLRequest* request,
     const AuthChallengeInfo& auth_info,
     const AuthCallback& callback,
     AuthCredentials* credentials) {
   DCHECK(CalledOnValidThread());
   return OnAuthRequired(request, auth_info, callback, credentials);
 }
 
 }  // namespace net