base::Bind() conversion for webkit.

webkit/glue/image_resource_fetcher.cc

Index: webkit/glue/image_resource_fetcher.cc
diff --git a/webkit/glue/image_resource_fetcher.cc b/webkit/glue/image_resource_fetcher.cc
index 6a37a3499e6e21635a4f89d2aad2d3b6d655e23b..35a6e19785e19bc5b65c8c89c4c4da5db7a2b5f6 100644
--- a/webkit/glue/image_resource_fetcher.cc
+++ b/webkit/glue/image_resource_fetcher.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/glue/image_resource_fetcher.h"
 
-#include "base/callback.h"
+#include "base/bind.h"

[csilv, 2011/11/21 21:26:31]

add #include "base/bind_helpers.h"

[dcheng, 2011/11/21 22:04:16]

Done.

 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "ui/gfx/size.h"
 #include "webkit/glue/image_decoder.h"
@@ -22,14 +22,15 @@ ImageResourceFetcher::ImageResourceFetcher(
     int id,
     int image_size,
     WebURLRequest::TargetType target_type,
-    Callback* callback)
+    const Callback& callback)
     : callback_(callback),
       id_(id),
       image_url_(image_url),
       image_size_(image_size) {
   fetcher_.reset(new ResourceFetcher(
       image_url, frame, target_type,
-      NewCallback(this, &ImageResourceFetcher::OnURLFetchComplete)));
+      base::Bind(&ImageResourceFetcher::OnURLFetchComplete,
+                 base::Unretained(this))));
 }
 
 ImageResourceFetcher::~ImageResourceFetcher() {
@@ -53,9 +54,9 @@ void ImageResourceFetcher::OnURLFetchComplete(
 
   // 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(this, bitmap);
+  Callback callback = callback_;
+  callback_.Reset();

[awong, 2011/11/21 21:46:56]

This works, but semantically is slightly funny.  I'd just do

// Take a reference to the callback as a stack variable
// before running the callback as it may lead to 
// our destruction.
Callback callback = callback_;
callback.Run(this, bitmap);

[dcheng, 2011/11/21 22:04:16]

Done.

+  callback.Run(this, bitmap);
 }
 
 }  // namespace webkit_glue