| Index: chrome/browser/webdata/autofill_profile_syncable_service.h
|
| diff --git a/chrome/browser/webdata/autofill_profile_syncable_service.h b/chrome/browser/webdata/autofill_profile_syncable_service.h
|
| index 88284c5959049f5da3a605181f4452b2ecf246b6..6f0a831b3ceba1bcaddb7042295b46b960c8f0f6 100644
|
| --- a/chrome/browser/webdata/autofill_profile_syncable_service.h
|
| +++ b/chrome/browser/webdata/autofill_profile_syncable_service.h
|
| @@ -17,6 +17,7 @@
|
| #include "components/autofill/browser/autofill_type.h"
|
| #include "components/autofill/browser/webdata/autofill_change.h"
|
| #include "components/autofill/browser/webdata/autofill_entry.h"
|
| +#include "components/autofill/browser/webdata/autofill_webdata_backend.h"
|
| #include "components/autofill/browser/webdata/autofill_webdata_service_observer.h"
|
| #include "sync/api/sync_change.h"
|
| #include "sync/api/sync_data.h"
|
| @@ -50,8 +51,9 @@ class AutofillProfileSyncableService
|
|
|
| // Creates a new AutofillProfileSyncableService and hangs it off of
|
| // |web_data_service|, which takes ownership.
|
| - static void CreateForWebDataService(
|
| + static void CreateForWebDataServiceAndBackend(
|
| autofill::AutofillWebDataService* web_data_service,
|
| + autofill::AutofillWebDataBackend* webdata_backend,
|
| const std::string& app_locale);
|
|
|
| // Retrieves the AutofillProfileSyncableService stored on |web_data_service|.
|
| @@ -84,7 +86,7 @@ class AutofillProfileSyncableService
|
|
|
| protected:
|
| AutofillProfileSyncableService(
|
| - autofill::AutofillWebDataService* web_data_service,
|
| + autofill::AutofillWebDataBackend* webdata_backend,
|
| const std::string& app_locale);
|
|
|
| // A convenience wrapper of a bunch of state we pass around while
|
| @@ -183,9 +185,9 @@ class AutofillProfileSyncableService
|
| sync_processor_.reset(sync_processor);
|
| }
|
|
|
| - autofill::AutofillWebDataService* web_data_service_; // WEAK
|
| + autofill::AutofillWebDataBackend* webdata_backend_; // WEAK
|
| std::string app_locale_;
|
| - ScopedObserver<autofill::AutofillWebDataService,
|
| + ScopedObserver<autofill::AutofillWebDataBackend,
|
| AutofillProfileSyncableService> scoped_observer_;
|
|
|
| // Cached Autofill profiles. *Warning* deleted profiles are still in the
|
|
|