base::Bind: Convert chrome_frame/.

chrome_frame/urlmon_url_request_private.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 CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_
 #define CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_
 
 #include <atlbase.h>
 #include <atlcom.h>
 
@@ skipping 20 matching lines @@
   virtual bool Read(int bytes_to_read);
 
   // Special function needed by ActiveDocument::Load()
   HRESULT InitPending(const GURL& url, IMoniker* moniker, IBindCtx* bind_ctx,
                       bool enable_frame_busting, bool privileged_mode,
                       HWND notification_window, IStream* cache);
 
   // Used from "DownloadRequestInHost".
   // Callback will be invoked either right away (if operation is finished) or
   // from inside ::OnStopBinding() when it is safe to reuse the bind_context.
-  typedef Callback4<IMoniker*, IBindCtx*, IStream*, const char*>::Type
+  typedef base::Callback<void(IMoniker*, IBindCtx*, IStream*, const char*)>
       TerminateBindCallback;
-  void TerminateBind(TerminateBindCallback* callback);
+  void TerminateBind(const TerminateBindCallback& callback);
 
   // Parent Window for UrlMon error dialogs
   void set_parent_window(HWND parent_window) {
     parent_window_ = parent_window;
   }
 
   // This function passes information on whether ChromeFrame is running in
   // privileged mode.
   void set_privileged_mode(bool privileged_mode) {
     privileged_mode_ = privileged_mode;
@@ skipping 57 matching lines @@
 
   void set_pending(bool pending) {
     pending_ = pending;
   }
 
   bool pending() const {
     return pending_;
   }
 
   bool terminate_requested() const {
-    return terminate_bind_callback_.get() != NULL;
+    return !terminate_bind_callback_.is_null();
   }
 
   std::string response_headers() {
     return response_headers_;
   }
 
  protected:
   void ReleaseBindings();
 
   HRESULT StartAsyncDownload();
@@ skipping 106 matching lines @@
   base::win::ScopedComPtr<IStream> pending_data_;
 
   size_t pending_read_size_;
   base::PlatformThreadId thread_;
   HWND parent_window_;
   bool headers_received_;
   int calling_delegate_;  // re-entrancy protection.
   // Set to true if the ChromeFrame instance is running in privileged mode.
   bool privileged_mode_;
   bool pending_;
-  scoped_ptr<TerminateBindCallback> terminate_bind_callback_;
+  TerminateBindCallback terminate_bind_callback_;
   std::string response_headers_;
   // Defaults to true and indicates whether we want to keep the original
   // transaction alive when we receive the last data notification from
   // urlmon.
   bool is_expecting_download_;
   // Set to true if the Urlmon transaction object needs to be cleaned up
   // when this object is destroyed. Happens if we return
   // INET_E_TERMINATE_BIND from OnDataAvailable in the last data notification.
   bool cleanup_transaction_;
   // Copy of the request headers.
   std::string request_headers_;
 
   DISALLOW_COPY_AND_ASSIGN(UrlmonUrlRequest);
 };
 
 #endif  // CHROME_FRAME_URLMON_URL_REQUEST_PRIVATE_H_