base::Bind: Convert BrowsingDataFileSystemHelper::StartFetching.

chrome/browser/browsing_data_file_system_helper.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_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 #pragma once
 
 #include <list>
 #include <string>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_types.h"
 
 class Profile;
@@ skipping 52 matching lines @@
   // can modify data it contains (by removing file systems).
   static BrowsingDataFileSystemHelper* Create(Profile* profile);
 
   // Starts the process of fetching file system data, which will call |callback|
   // upon completion, passing it a constant list of FileSystemInfo objects.
   // StartFetching must be called only in the UI thread; the provided Callback1
   // will likewise be executed asynchronously on the UI thread.
   //
   // BrowsingDataFileSystemHelper takes ownership of the Callback1, and is
   // responsible for deleting it once it's no longer needed.
-  virtual void StartFetching(
-      Callback1<const std::list<FileSystemInfo>& >::Type* callback) = 0;
+  virtual void StartFetching(const base::Callback<
+      void(const std::list<FileSystemInfo>&)>& callback) = 0;
 
   // Cancels the notification callback associated with StartFetching. Clients
   // that are destroyed before the callback is triggered must call this, and
   // it must be called only on the UI thread.
   virtual void CancelNotification() = 0;
 
   // Deletes any temporary or persistent file systems associated with |origin|
   // from the disk. Deletion will occur asynchronously on the FILE thread, but
   // this function must be called only on the UI thread.
   virtual void DeleteFileSystemOrigin(const GURL& origin) = 0;
@@ skipping 32 matching lines @@
   void AddFileSystem(const GURL& origin,
                      fileapi::FileSystemType type,
                      int64 size);
 
   // Clear this helper's list of canned filesystems.
   void Reset();
 
   // True if no filesystems are currently stored.
   bool empty() const;
 
-  // BrowsingDataFileSystemHelper methods.
-  virtual void StartFetching(
-      Callback1<const std::list<FileSystemInfo>& >::Type* callback);
-  virtual void CancelNotification();
+  // BrowsingDataFileSystemHelper implementation.
+  virtual void StartFetching(const base::Callback<
+      void(const std::list<FileSystemInfo>&)>& callback) OVERRIDE;
+  virtual void CancelNotification() OVERRIDE;
 
   // Note that this doesn't actually have an implementation for this canned
   // class. It hasn't been necessary for anything that uses the canned
   // implementation, as the canned class is only used in tests, or in read-only
   // contexts (like the non-modal cookie dialog).
-  virtual void DeleteFileSystemOrigin(const GURL& origin) {}
+  virtual void DeleteFileSystemOrigin(const GURL& origin) OVERRIDE {}
 
  private:
   // Used by Clone() to create an object without a Profile
   CannedBrowsingDataFileSystemHelper();
   virtual ~CannedBrowsingDataFileSystemHelper();
 
   // Triggers the success callback as the end of a StartFetching workflow. This
   // must be called on the UI thread.
   void NotifyOnUIThread();
 
   // Holds the current list of file systems returned to the client after
   // StartFetching is called.
   std::list<FileSystemInfo> file_system_info_;
 
-  // Holds the callback passed in at the beginning of the StartFetching workflow
-  // so that it can be triggered via NotifyOnUIThread.
-  scoped_ptr<Callback1<const std::list<FileSystemInfo>& >::Type >
-      completion_callback_;
+  // The callback passed in at the beginning of the StartFetching workflow so
+  // that it can be triggered via NotifyOnUIThread.
+  base::Callback<void(const std::list<FileSystemInfo>&)> completion_callback_;
 
   // Indicates whether or not we're currently fetching information: set to true
   // when StartFetching is called on the UI thread, and reset to false when
   // NotifyOnUIThread triggers the success callback.
   // This property only mutates on the UI thread.
   bool is_fetching_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataFileSystemHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_