components/webdata: Cleanup callback usage in WebDatabaseService.

components/webdata/common/web_database_service.h

 // Copyright 2013 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.
 
 // Chromium settings and storage represent user-selected preferences and
 // information and MUST not be extracted, overwritten or modified except
 // through Chromium defined APIs.
 
 #ifndef COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
 #define COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_
@@ skipping 34 matching lines @@
 // with web pages).
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class WEBDATA_EXPORT WebDatabaseService
     : public base::RefCountedDeleteOnMessageLoop<WebDatabaseService> {
  public:
   typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
   typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask;
 
+  // Types for managing DB loading callbacks.
+  typedef base::Closure DBLoadedCallback;
+  typedef base::Callback<void(sql::InitStatus)> DBLoadErrorCallback;
+
   // Takes the path to the WebDatabase file.
   // WebDatabaseService lives on |ui_thread| and posts tasks to |db_thread|.
   WebDatabaseService(const base::FilePath& path,
                      const scoped_refptr<base::MessageLoopProxy>& ui_thread,
                      const scoped_refptr<base::MessageLoopProxy>& db_thread);
 
   // Adds |table| as a WebDatabaseTable that will participate in
   // managing the database, transferring ownership. All calls to this
   // method must be made before |LoadDatabase| is called.
   virtual void AddTable(scoped_ptr<WebDatabaseTable> table);
@@ skipping 29 matching lines @@
   // Cancel an existing request for a task on the DB thread.
   // TODO(caitkp): Think about moving the definition of the Handle type to
   // somewhere else.
   virtual void CancelRequest(WebDataServiceBase::Handle h);
 
   // Register a callback to be notified that the database has loaded. Multiple
   // callbacks may be registered, and each will be called at most once
   // (following a successful database load), then cleared.
   // Note: if the database load is already complete, then the callback will NOT
   // be stored or called.
-  void RegisterDBLoadedCallback(const base::Callback<void(void)>& callback);
+  void RegisterDBLoadedCallback(const DBLoadedCallback& callback);
 
   // Register a callback to be notified that the database has failed to load.
   // Multiple callbacks may be registered, and each will be called at most once
   // (following a database load failure), then cleared.
   // Note: if the database load is already complete, then the callback will NOT
   // be stored or called.
-  void RegisterDBErrorCallback(
-      const base::Callback<void(sql::InitStatus)>& callback);
+  void RegisterDBErrorCallback(const DBLoadErrorCallback& callback);
 
-  bool db_loaded() { return db_loaded_; };
+  bool db_loaded() const { return db_loaded_; };
 
  private:
   class BackendDelegate;
   friend class BackendDelegate;
   friend class base::RefCountedDeleteOnMessageLoop<WebDatabaseService>;
   friend class base::DeleteHelper<WebDatabaseService>;
 
+  typedef std::vector<DBLoadedCallback> LoadedCallbacks;
+  typedef std::vector<DBLoadErrorCallback> ErrorCallbacks;
+
   virtual ~WebDatabaseService();
 
   void OnDatabaseLoadDone(sql::InitStatus status);
 
   base::FilePath path_;
 
   // The primary owner is |WebDatabaseService| but is refcounted because
   // PostTask on DB thread may outlive us.
   scoped_refptr<WebDataServiceBackend> wds_backend_;
 
   // All vended weak pointers are invalidated in ShutdownDatabase().
   base::WeakPtrFactory<WebDatabaseService> weak_ptr_factory_;
 
-  // Types for managing DB loading callbacks.
-  typedef base::Callback<void(void)> DBLoadedCallback;
-  typedef std::vector<DBLoadedCallback> LoadedCallbacks;
-
-  typedef base::Callback<void(sql::InitStatus)> DBLoadErrorCallback;
-  typedef std::vector<DBLoadErrorCallback> ErrorCallbacks;
-
   // Callbacks to be called once the DB has loaded.
   LoadedCallbacks loaded_callbacks_;
 
   // Callbacks to be called if the DB has failed to load.
   ErrorCallbacks error_callbacks_;
 
   // True if the WebDatabase has loaded.
   bool db_loaded_;
 
   scoped_refptr<base::MessageLoopProxy> db_thread_;
+
+  DISALLOW_COPY_AND_ASSIGN(WebDatabaseService);
 };
 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_