base::Bind: Convert net::NetworkDelegate.

net/base/network_delegate.h

 // 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.
 
 #ifndef NET_BASE_NETWORK_DELEGATE_H_
 #define NET_BASE_NETWORK_DELEGATE_H_
 #pragma once
 
 #include "base/callback.h"
 #include "base/string16.h"
@@ skipping 32 matching lines @@
   };
   typedef base::Callback<void(AuthRequiredResponse)> AuthCallback;
 
   virtual ~NetworkDelegate() {}
 
   // Notification interface called by the network stack. Note that these
   // functions mostly forward to the private virtuals. They also add some sanity
   // checking on parameters. See the corresponding virtuals for explanations of
   // the methods and their arguments.
   int NotifyBeforeURLRequest(URLRequest* request,
-                             OldCompletionCallback* callback,
+                             const net::CompletionCallback& callback,

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

Since we're already in the net namespace, none of these need the net:: prefix. 
Not a necssary change, but i think it's worth considering.

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

Done.

                              GURL* new_url);
   int NotifyBeforeSendHeaders(URLRequest* request,
-                              OldCompletionCallback* callback,
+                              const net::CompletionCallback& callback,
                               HttpRequestHeaders* headers);
   void NotifySendHeaders(URLRequest* request,
                          const HttpRequestHeaders& headers);
   int NotifyHeadersReceived(
       URLRequest* request,
-      OldCompletionCallback* callback,
+      const net::CompletionCallback& callback,
       HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers);
   void NotifyBeforeRedirect(URLRequest* request,
                             const GURL& new_location);
   void NotifyResponseStarted(URLRequest* request);
   void NotifyRawBytesRead(const URLRequest& request, int bytes_read);
   void NotifyCompleted(URLRequest* request);
   void NotifyURLRequestDestroyed(URLRequest* request);
   void NotifyPACScriptError(int line_number, const string16& error);
   AuthRequiredResponse NotifyAuthRequired(URLRequest* request,
                                           const AuthChallengeInfo& auth_info,
                                           const AuthCallback& callback,
                                           AuthCredentials* credentials);
 
  private:
   // This is the interface for subclasses of NetworkDelegate to implement. This
   // member functions will be called by the respective public notification
   // member function, which will perform basic sanity checking.
 
   // Called before a request is sent. Allows the delegate to rewrite the URL
   // being fetched by modifying |new_url|. |callback| and |new_url| are valid
   // only until OnURLRequestDestroyed is called for this request. Returns a net
   // status code, generally either OK to continue with the request or
   // ERR_IO_PENDING if the result is not ready yet. A status code other than OK
   // and ERR_IO_PENDING will cancel the request and report the status code as
   // the reason.
   virtual int OnBeforeURLRequest(URLRequest* request,
-                                 OldCompletionCallback* callback,
+                                 const net::CompletionCallback& callback,
                                  GURL* new_url) = 0;
 
   // Called right before the HTTP headers are sent. Allows the delegate to
   // read/write |headers| before they get sent out. |callback| and |headers| are
   // valid only until OnURLRequestDestroyed is called for this request.
   // Returns a net status code.
   virtual int OnBeforeSendHeaders(URLRequest* request,
-                                  OldCompletionCallback* callback,
+                                  const net::CompletionCallback& callback,
                                   HttpRequestHeaders* headers) = 0;
 
   // Called right before the HTTP request(s) are being sent to the network.
   virtual void OnSendHeaders(URLRequest* request,
                              const HttpRequestHeaders& headers) = 0;
 
   // Called for HTTP requests when the headers have been received. Returns a net
   // status code, generally either OK to continue with the request or
   // ERR_IO_PENDING if the result is not ready yet.  A status code other than OK
   // and ERR_IO_PENDING will cancel the request and report the status code as
   // the reason.
   // |original_response_headers| contains the headers as received over the
   // network, these must not be modified. |override_response_headers| can be set
   // to new values, that should be considered as overriding
   // |original_response_headers|.
   virtual int OnHeadersReceived(
       URLRequest* request,
-      OldCompletionCallback* callback,
+      const net::CompletionCallback& callback,
       HttpResponseHeaders* original_response_headers,
       scoped_refptr<HttpResponseHeaders>* override_response_headers) = 0;
 
   // Called right after a redirect response code was received.
   virtual void OnBeforeRedirect(URLRequest* request,
                                 const GURL& new_location) = 0;
 
   // This corresponds to URLRequestDelegate::OnResponseStarted.
   virtual void OnResponseStarted(URLRequest* request) = 0;
 
@@ skipping 31 matching lines @@
   virtual AuthRequiredResponse OnAuthRequired(
       URLRequest* request,
       const AuthChallengeInfo& auth_info,
       const AuthCallback& callback,
       AuthCredentials* credentials) = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_DELEGATE_H_