base::Bind conversion for chrome/browser/extensions/file_reader.

chrome/browser/extensions/file_reader_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 "base/callback.h"
+#include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/extension_test_util.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class FileReaderTest : public testing::Test {
  public:
   FileReaderTest() : file_thread_(BrowserThread::FILE) {
     file_thread_.Start();
   }
  private:
   MessageLoop message_loop_;
   BrowserThread file_thread_;
 };
 
 class Receiver {
  public:
   Receiver() : succeeded_(false) {
   }
 
-  FileReader::Callback* NewCallback() {
-    return ::NewCallback(this, &Receiver::DidReadFile);
+  FileReader::Callback NewCallback() {
+    return base::Bind(&Receiver::DidReadFile, base::Unretained(this));
   }
 
   bool succeeded() const { return succeeded_; }
   const std::string& data() const { return data_; }
 
  private:
   void DidReadFile(bool success, const std::string& data) {
     succeeded_ = success;
     data_ = data;
     MessageLoop::current()->Quit();
@@ skipping 47 matching lines @@
   scoped_refptr<FileReader> file_reader(
       new FileReader(resource, receiver.NewCallback()));
   file_reader->Start();
 
   MessageLoop::current()->Run();
 
   EXPECT_FALSE(receiver.succeeded());
 }
 
 }  // namespace