Hook up Autofill Backend interface to SyncableServices

components/autofill/browser/webdata/autofill_webdata_backend.cc

 // 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.
 
 #include "components/autofill/browser/webdata/autofill_webdata_backend.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
+#include "components/autofill/browser/webdata/autofill_backend_delegate.h"
 #include "components/autofill/browser/webdata/autofill_change.h"
 #include "components/autofill/browser/webdata/autofill_entry.h"
 #include "components/autofill/browser/webdata/autofill_table.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
 #include "components/autofill/common/form_field_data.h"
 
 using base::Bind;
 using base::Time;
 using content::BrowserThread;
 
 namespace autofill {
-AutofillWebDataBackend::AutofillWebDataBackend() {
+
+AutofillWebDataBackend::AutofillWebDataBackend()
+  : weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 void AutofillWebDataBackend::AddObserver(
     AutofillWebDataServiceObserverOnDBThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_observer_list_.AddObserver(observer);
 }
 
 void AutofillWebDataBackend::RemoveObserver(
     AutofillWebDataServiceObserverOnDBThread* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   db_observer_list_.RemoveObserver(observer);
 }
 
+void AutofillWebDataBackend::GetDelegate(
+  const AutofillWebDataService::DelegateOnDBCallback& callback,
+  base::WeakPtr<WebDatabase> db) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  if (!delegate_.get())
+    delegate_.reset(new AutofillBackendDelegate(
+        db, weak_ptr_factory_.GetWeakPtr()));
+  callback.Run(delegate_.get());
+}
+
 AutofillWebDataBackend::~AutofillWebDataBackend() {
+  delegate_.reset();
+  weak_ptr_factory_.InvalidateWeakPtrs();

[erikwright (departed), 2013/04/25 19:06:10]

Not necessary - this is done by ~WeakPtrFactory.

Just re-order the member declarations so that they are destroyed in this order.

 }
 
 WebDatabase::State AutofillWebDataBackend::AddFormElementsImpl(
     const std::vector<FormFieldData>& fields, WebDatabase* db) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   AutofillChangeList changes;
   if (!AutofillTable::FromWebDatabase(db)->AddFormFieldValues(
         fields, &changes)) {
     NOTREACHED();
     return WebDatabase::COMMIT_NOT_NEEDED;
@@ skipping 257 matching lines @@
 void AutofillWebDataBackend::DestroyAutofillCreditCardResult(
       const WDTypedResult* result) {
   DCHECK(result->GetType() == AUTOFILL_CREDITCARDS_RESULT);
   const WDResult<std::vector<CreditCard*> >* r =
       static_cast<const WDResult<std::vector<CreditCard*> >*>(result);
 
   std::vector<CreditCard*> credit_cards = r->GetValue();
   STLDeleteElements(&credit_cards);
 }
 
-}
+} // namespace autofill