base::Bind() conversion for webkit.

webkit/glue/resource_fetcher.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 "webkit/glue/resource_fetcher.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 
 using base::TimeDelta;
 using WebKit::WebFrame;
 using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
 
 namespace webkit_glue {
 
 ResourceFetcher::ResourceFetcher(const GURL& url, WebFrame* frame,
                                  WebURLRequest::TargetType target_type,
-                                 Callback* callback)
+                                 const Callback& callback)
     : url_(url),
       target_type_(target_type),
       completed_(false),
       callback_(callback) {
   // Can't do anything without a frame.  However, delegate can be NULL (so we
   // can do a http request and ignore the results).
   DCHECK(frame);
   Start(frame);
 }
 
@@ skipping 13 matching lines @@
   WebURLRequest request(url_);
   request.setTargetType(target_type_);
   frame->dispatchWillSendRequest(request);
 
   loader_.reset(WebKit::webKitPlatformSupport()->createURLLoader());
   loader_->loadAsynchronously(request, this);
 }
 
 void ResourceFetcher::RunCallback(const WebURLResponse& response,
                                   const std::string& data) {
-  if (!callback_.get())
+  if (callback_.is_null())
     return;
 
-  // Take care to clear callback_ before running the callback as it may lead to
-  // our destruction.
-  scoped_ptr<Callback> callback;
-  callback.swap(callback_);
-  callback->Run(response, data);
+  // Take a reference to the callback as running the callback may lead to our
+  // destruction.
+  Callback callback = callback_;
+  callback.Run(response, data);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // WebURLLoaderClient methods
 
 void ResourceFetcher::willSendRequest(
     WebURLLoader* loader, WebURLRequest& new_request,
     const WebURLResponse& redirect_response) {
 }
 
@@ skipping 39 matching lines @@
 
   // Go ahead and tell our delegate that we're done.
   RunCallback(WebURLResponse(), std::string());
 }
 
 /////////////////////////////////////////////////////////////////////////////
 // A resource fetcher with a timeout
 
 ResourceFetcherWithTimeout::ResourceFetcherWithTimeout(
     const GURL& url, WebFrame* frame, WebURLRequest::TargetType target_type,
-    int timeout_secs, Callback* callback)
+    int timeout_secs, const Callback& callback)
     : ResourceFetcher(url, frame, target_type, callback) {
   timeout_timer_.Start(FROM_HERE, TimeDelta::FromSeconds(timeout_secs), this,
                        &ResourceFetcherWithTimeout::TimeoutFired);
 }
 
 ResourceFetcherWithTimeout::~ResourceFetcherWithTimeout() {
 }
 
 void ResourceFetcherWithTimeout::TimeoutFired() {
   if (!completed_) {
     loader_->cancel();
     didFail(NULL, WebURLError());
   }
 }
 
 }  // namespace webkit_glue