base::Bind: Convert BrowsingDataLocalStorageHelper::StartFetching.

chrome/browser/browsing_data_local_storage_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_LOCAL_STORAGE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
 #pragma once
 
 #include <list>
 #include <set>
 #include <string>
 
-#include "base/callback_old.h"
+#include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.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"
 
 class Profile;
 
 // This class fetches local storage information in the WebKit thread, and
@@ skipping 33 matching lines @@
     int64 size;
     base::Time last_modified;
   };
 
   explicit BrowsingDataLocalStorageHelper(Profile* profile);
 
   // Starts the fetching process, which will notify its completion via
   // callback.
   // This must be called only in the UI thread.
   virtual void StartFetching(
-      Callback1<const std::list<LocalStorageInfo>& >::Type* callback);
+      const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback)
+          OVERRIDE;
   // Cancels the notification callback (i.e., the window that created it no
   // longer exists).
   // This must be called only in the UI thread.
-  virtual void CancelNotification();
+  virtual void CancelNotification() OVERRIDE;
   // Requests a single local storage file to be deleted in the WEBKIT thread.
-  virtual void DeleteLocalStorageFile(const FilePath& file_path);
+  virtual void DeleteLocalStorageFile(const FilePath& file_path) OVERRIDE;
 
  protected:
   friend class base::RefCountedThreadSafe<BrowsingDataLocalStorageHelper>;
   virtual ~BrowsingDataLocalStorageHelper();
 
   // Notifies the completion callback in the UI thread.
   void NotifyInUIThread();
 
   Profile* profile_;
 
   // This only mutates on the UI thread.
-  scoped_ptr<Callback1<const std::list<LocalStorageInfo>& >::Type >
-      completion_callback_;
+  base::Callback<void(const std::list<LocalStorageInfo>&)> completion_callback_;
 
   // Indicates whether or not we're currently fetching information:
   // it's true when StartFetching() is called in the UI thread, and it's reset
   // after we notified the callback in the UI thread.
   // This only mutates on the UI thread.
   bool is_fetching_;
 
   // This only mutates in the WEBKIT thread.
   std::list<LocalStorageInfo> local_storage_info_;
 
  private:
   // Enumerates all local storage files in the WEBKIT thread.
   void FetchLocalStorageInfoInWebKitThread();
   // Delete a single local storage file in the WEBKIT thread.
   void DeleteLocalStorageFileInWebKitThread(const FilePath& file_path);
 
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataLocalStorageHelper);
 };
 
 // This class is a thin wrapper around BrowsingDataLocalStorageHelper that does
 // not fetch its information from the local storage tracker, but gets them
 // passed as a parameter during construction.
 class CannedBrowsingDataLocalStorageHelper
     : public BrowsingDataLocalStorageHelper {
  public:
   explicit CannedBrowsingDataLocalStorageHelper(Profile* profile);
 
   // Return a copy of the local storage helper. Only one consumer can use the
   // StartFetching method at a time, so we need to create a copy of the helper
-  // everytime we instantiate a cookies tree model for it.
+  // every time we instantiate a cookies tree model for it.
   CannedBrowsingDataLocalStorageHelper* Clone();
 
   // Add a local storage to the set of canned local storages that is returned
   // by this helper.
   void AddLocalStorage(const GURL& origin);
 
   // Clear the list of canned local storages.
   void Reset();
 
   // True if no local storages are currently stored.
   bool empty() const;
 
-  // BrowsingDataLocalStorageHelper methods.
+  // BrowsingDataLocalStorageHelper implementation.
   virtual void StartFetching(
-      Callback1<const std::list<LocalStorageInfo>& >::Type* callback);
-  virtual void CancelNotification() {}
+      const base::Callback<void(const std::list<LocalStorageInfo>&)>& callback)
+          OVERRIDE;
+  virtual void CancelNotification() OVERRIDE {}
 
  private:
   virtual ~CannedBrowsingDataLocalStorageHelper();
 
   // Convert the pending local storage info to local storage info objects.
   void ConvertPendingInfoInWebKitThread();
 
   // Used to protect access to pending_local_storage_info_.
   mutable base::Lock lock_;
 
   // May mutate on WEBKIT and UI threads.
   std::set<GURL> pending_local_storage_info_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataLocalStorageHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_