base::Bind: Convert BrowsingDatabaseHelper::StartFetching.

chrome/browser/browsing_data_database_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_DATABASE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_DATABASE_HELPER_H_
 #pragma once
 
 #include <list>
 #include <string>
 
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/database/database_tracker.h"
 
 class Profile;
 
 // This class fetches database information in the FILE thread, and notifies
 // the UI thread upon completion.
@@ skipping 27 matching lines @@
     int64 size;
     base::Time last_modified;
   };
 
   explicit BrowsingDataDatabaseHelper(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<DatabaseInfo>& >::Type* callback);
+      const base::Callback<void(const std::list<DatabaseInfo>&)>& callback);
 
   // 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();
 
   // Requests a single database to be deleted in the FILE thread. This must be
   // called in the UI thread.
   virtual void DeleteDatabase(const std::string& origin,
                               const std::string& name);
 
  protected:
   friend class base::RefCountedThreadSafe<BrowsingDataDatabaseHelper>;
   virtual ~BrowsingDataDatabaseHelper();
 
   // Notifies the completion callback. This must be called in the UI thread.
   void NotifyInUIThread();
 
   // This only mutates in the FILE thread.
   std::list<DatabaseInfo> database_info_;
 
   // This only mutates on the UI thread.
-  scoped_ptr<Callback1<const std::list<DatabaseInfo>& >::Type >
-      completion_callback_;
+  base::Callback<void(const std::list<DatabaseInfo>&)> 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 notify the callback in the UI thread.
   // This only mutates on the UI thread.
   bool is_fetching_;
 
  private:
   // Enumerates all databases. This must be called in the FILE thread.
   void FetchDatabaseInfoOnFileThread();
@@ skipping 24 matching lines @@
   void AddDatabase(const GURL& origin,
                    const std::string& name,
                    const std::string& description);
 
   // Clear the list of canned databases.
   void Reset();
 
   // True if no databases are currently stored.
   bool empty() const;
 
-  // BrowsingDataDatabaseHelper methods.
+  // BrowsingDataDatabaseHelper implementation.
   virtual void StartFetching(
-      Callback1<const std::list<DatabaseInfo>& >::Type* callback);
-  virtual void CancelNotification() {}
+      const base::Callback<void(const std::list<DatabaseInfo>&)>& callback)
+          OVERRIDE;
+  virtual void CancelNotification() OVERRIDE {}
 
  private:
   struct PendingDatabaseInfo {
     PendingDatabaseInfo();
     PendingDatabaseInfo(const GURL& origin,
                         const std::string& name,
                         const std::string& description);
     ~PendingDatabaseInfo();
 
     GURL origin;
@@ skipping 11 matching lines @@
 
   // This may mutate on WEBKIT and UI threads.
   std::list<PendingDatabaseInfo> pending_database_info_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataDatabaseHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_DATABASE_HELPER_H_