base::Bind() conversion for webkit.

webkit/glue/resource_fetcher_unittest.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/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/unittest_test_server.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_shell_test.h"
 
 using WebKit::WebFrame;
@@ skipping 17 matching lines @@
       : completed_(false),
         timed_out_(false) {
     // Start a repeating timer waiting for the download to complete.  The
     // callback has to be a static function, so we hold on to our instance.
     FetcherDelegate::instance_ = this;
     StartTimer();
   }
 
   virtual ~FetcherDelegate() {}
 
-  ResourceFetcher::Callback* NewCallback() {
-    return ::NewCallback(this, &FetcherDelegate::OnURLFetchComplete);
+  ResourceFetcher::Callback NewCallback() {
+    return base::Bind(&FetcherDelegate::OnURLFetchComplete,
+                      base::Unretained(this));
   }
 
   virtual void OnURLFetchComplete(const WebURLResponse& response,
                                   const std::string& data) {
     response_ = response;
     data_ = data;
     completed_ = true;
     timer_.Stop();
     MessageLoop::current()->Quit();
   }
@@ skipping 149 matching lines @@
   scoped_ptr<ResourceFetcher> fetcher(new ResourceFetcherWithTimeout(
       url, frame, WebURLRequest::TargetIsMainFrame,
       0, delegate->NewCallback()));
   delegate->SetFetcher(fetcher.release());
 
   delegate->WaitForResponse();
   EXPECT_FALSE(delegate->timed_out());
 }
 
 }  // namespace