Hook up Autofill Backend interface to SyncableServices

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 33 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 class WEBDATA_EXPORT WebDatabaseService
     : public base::RefCountedThreadSafe<
           WebDatabaseService,
           content::BrowserThread::DeleteOnUIThread> {
  public:
   typedef base::Callback<scoped_ptr<WDTypedResult>(WebDatabase*)> ReadTask;
   typedef base::Callback<WebDatabase::State(WebDatabase*)> WriteTask;
+  typedef base::Callback<void(base::WeakPtr<WebDatabase>)> DBCallback;
 
   // Takes the path to the WebDatabase file.
   explicit WebDatabaseService(const base::FilePath& path);
 
   // 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);
 
   // Initializes the web database service. Takes a callback which will return
   // the status of the DB after the init.
   virtual void LoadDatabase();
 
   // Unloads the database without actually shutting down the service.  This can
   // be used to temporarily reduce the browser process' memory footprint.
   virtual void UnloadDatabase();
 
   // Unloads database and will not reload.
   virtual void ShutdownDatabase();
 
-  // Gets a ptr to the WebDatabase (owned by WebDatabaseService).
-  // TODO(caitkp): remove this method once SyncServices no longer depend on it.
-  virtual WebDatabase* GetDatabaseOnDB() const;
+  // Asynchronously gets an instance of |WebDatabase|, which can be
+  // used to do work on the DB thread. This method is meant to be called from
+  // the UI thread, but the callback will be called on the DB thread.
+  void GetDatabaseOnDB(const DBCallback& callback);
 
   // Schedule an update/write task on the DB thread.
   virtual void ScheduleDBTask(
       const tracked_objects::Location& from_here,
       const WriteTask& task);
 
   // Schedule a read task on the DB thread.
   virtual WebDataServiceBase::Handle ScheduleDBTaskWithResult(
       const tracked_objects::Location& from_here,
       const ReadTask& task,
@@ skipping 27 matching lines @@
   // PostTask on DB thread may outlive us.
   scoped_refptr<WebDataServiceBackend> wds_backend_;
 
   ObserverList<WebDatabaseObserver> observer_list_;
 
   // All vended weak pointers are invalidated in ShutdownDatabase().
   base::WeakPtrFactory<WebDatabaseService> weak_ptr_factory_;
 };
 
 #endif  // COMPONENTS_WEBDATA_COMMON_WEB_DATABASE_SERVICE_H_