Hook up Autofill Backend interface to SyncableServices

components/autofill/browser/webdata/autofill_webdata_service.h

 // Copyright (c) 2012 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 COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 77 matching lines @@
       WebDataServiceConsumer* consumer) OVERRIDE;
   virtual void RemoveAutofillDataModifiedBetween(
       const base::Time& delete_begin, const base::Time& delete_end) OVERRIDE;
 
   void AddObserver(AutofillWebDataServiceObserverOnDBThread* observer);
   void RemoveObserver(AutofillWebDataServiceObserverOnDBThread* observer);
 
   void AddObserver(AutofillWebDataServiceObserverOnUIThread* observer);
   void RemoveObserver(AutofillWebDataServiceObserverOnUIThread* observer);
 
+  void NotifyAutofillMultipleChangedOnUIThread();

[Ilya Sherman, 2013/05/13 23:44:47]

nit: Why did you change the visibility of this method?

[Cait (Slow), 2013/05/14 22:30:08]

This method is passed to the backend as a callback. It will be used to notify
the UI thread, instead of the the static NotifyOfMultipleAutofillChanges()
method. (That said, it doesn't need to be public. Protected should suffice).

+
   // Returns a SupportsUserData objects that may be used to store data
   // owned by the DB thread on this object. Should be called only from
   // the DB thread, and will be destroyed on the DB thread soon after
   // |ShutdownOnUIThread()| is called.
   base::SupportsUserData* GetDBUserData();
 
   // Takes a callback which will be called on the DB thread with a pointer to an
   // |AutofillWebdataBackend|. This backend can be used to access or update the
   // WebDatabase directly on the DB thread.
   void GetAutofillBackend(
       const base::Callback<void(AutofillWebDataBackend*)>& callback);
 
  protected:
   virtual ~AutofillWebDataService();
 
   virtual void ShutdownOnDBThread();
 
+  base::WeakPtr<AutofillWebDataService> AsWeakPtr() {
+    return weak_ptr_factory_.GetWeakPtr();
+  }
+
  private:
   // This makes the destructor public, and thus allows us to aggregate
   // SupportsUserData. It is private by default to prevent incorrect
   // usage in class hierarchies where it is inherited by
   // reference-counted objects.
   class SupportsUserDataAggregatable : public base::SupportsUserData {
    public:
     SupportsUserDataAggregatable() {}
     virtual ~SupportsUserDataAggregatable() {}
    private:
     DISALLOW_COPY_AND_ASSIGN(SupportsUserDataAggregatable);
   };
 
-  void NotifyAutofillMultipleChangedOnUIThread();
-
   // Storage for user data to be accessed only on the DB thread. May
   // be used e.g. for SyncableService subclasses that need to be owned
   // by this object. Is created on first call to |GetDBUserData()|.
   scoped_ptr<SupportsUserDataAggregatable> db_thread_user_data_;
 
   ObserverList<AutofillWebDataServiceObserverOnUIThread> ui_observer_list_;
 
   // This factory is used on the UI thread. All vended weak pointers are
   // invalidated in ShutdownOnUIThread().
   base::WeakPtrFactory<AutofillWebDataService> weak_ptr_factory_;
 
   scoped_refptr<AutofillWebDataBackendImpl> autofill_backend_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillWebDataService);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_WEBDATA_AUTOFILL_WEBDATA_SERVICE_H_