Index: chrome/browser/webdata/autocomplete_syncable_service.h |
diff --git a/chrome/browser/webdata/autocomplete_syncable_service.h b/chrome/browser/webdata/autocomplete_syncable_service.h |
index 0d0163104e162d3bb12e7b769d56a4144ed31d14..3421630bb903b8c4bbe56dd0abb5011a4da35e76 100644 |
--- a/chrome/browser/webdata/autocomplete_syncable_service.h |
+++ b/chrome/browser/webdata/autocomplete_syncable_service.h |
@@ -25,13 +25,15 @@ |
#include "sync/api/syncable_service.h" |
class ProfileSyncServiceAutofillTest; |
+ |
+namespace csync { |
class SyncErrorFactory; |
+} |
namespace sync_pb { |
class AutofillSpecifics; |
} |
- |
// The sync implementation for autocomplete. |
// MergeDataAndStartSyncing() called first, it does cloud->local and |
// local->cloud syncs. Then for each cloud change we receive |
@@ -39,7 +41,7 @@ class AutofillSpecifics; |
// TODO(georgey) : remove reliance on the notifications and make it to be called |
// from web_data_service directly. |
class AutocompleteSyncableService |
- : public SyncableService, |
+ : public csync::SyncableService, |
public content::NotificationObserver, |
public base::NonThreadSafe { |
public: |
@@ -48,17 +50,18 @@ class AutocompleteSyncableService |
static syncable::ModelType model_type() { return syncable::AUTOFILL; } |
- // SyncableService implementation. |
- virtual SyncError MergeDataAndStartSyncing( |
+ // csync::SyncableService implementation. |
+ virtual csync::SyncError MergeDataAndStartSyncing( |
syncable::ModelType type, |
- const SyncDataList& initial_sync_data, |
- scoped_ptr<SyncChangeProcessor> sync_processor, |
- scoped_ptr<SyncErrorFactory> error_handler) OVERRIDE; |
+ const csync::SyncDataList& initial_sync_data, |
+ scoped_ptr<csync::SyncChangeProcessor> sync_processor, |
+ scoped_ptr<csync::SyncErrorFactory> error_handler) OVERRIDE; |
virtual void StopSyncing(syncable::ModelType type) OVERRIDE; |
- virtual SyncDataList GetAllSyncData(syncable::ModelType type) const OVERRIDE; |
- virtual SyncError ProcessSyncChanges( |
+ virtual csync::SyncDataList GetAllSyncData( |
+ syncable::ModelType type) const OVERRIDE; |
+ virtual csync::SyncError ProcessSyncChanges( |
const tracked_objects::Location& from_here, |
- const SyncChangeList& change_list) OVERRIDE; |
+ const csync::SyncChangeList& change_list) OVERRIDE; |
// NotificationObserver implementation. |
virtual void Observe(int type, |
@@ -91,7 +94,7 @@ class AutocompleteSyncableService |
// of the iterator is longer than the map object. The bool in the pair is used |
// to indicate if the item needs to be added (true) or updated (false). |
typedef std::map<AutofillKey, |
- std::pair<SyncChange::SyncChangeType, |
+ std::pair<csync::SyncChange::SyncChangeType, |
std::vector<AutofillEntry>::iterator> > |
AutocompleteEntryMap; |
@@ -101,7 +104,7 @@ class AutocompleteSyncableService |
// |new_entries| - entries that came from the sync. |
// |ignored_entries| - entries that came from the sync, but too old to be |
// stored and immediately discarded. |
- void CreateOrUpdateEntry(const SyncData& data, |
+ void CreateOrUpdateEntry(const csync::SyncData& data, |
AutocompleteEntryMap* loaded_data, |
std::vector<AutofillEntry>* new_entries); |
@@ -110,9 +113,10 @@ class AutocompleteSyncableService |
sync_pb::EntitySpecifics* autofill_specifics); |
// Deletes the database entry corresponding to the |autofill| specifics. |
- SyncError AutofillEntryDelete(const sync_pb::AutofillSpecifics& autofill); |
+ csync::SyncError AutofillEntryDelete( |
+ const sync_pb::AutofillSpecifics& autofill); |
- SyncData CreateSyncData(const AutofillEntry& entry) const; |
+ csync::SyncData CreateSyncData(const AutofillEntry& entry) const; |
// Syncs |changes| to the cloud. |
void ActOnChanges(const AutofillChangeList& changes); |
@@ -122,7 +126,7 @@ class AutocompleteSyncableService |
// For unit-tests. |
AutocompleteSyncableService(); |
- void set_sync_processor(SyncChangeProcessor* sync_processor) { |
+ void set_sync_processor(csync::SyncChangeProcessor* sync_processor) { |
sync_processor_.reset(sync_processor); |
} |
@@ -134,11 +138,11 @@ class AutocompleteSyncableService |
// We receive ownership of |sync_processor_| in MergeDataAndStartSyncing() and |
// destroy it in StopSyncing(). |
- scoped_ptr<SyncChangeProcessor> sync_processor_; |
+ scoped_ptr<csync::SyncChangeProcessor> sync_processor_; |
// We receive ownership of |error_handler_| in MergeDataAndStartSyncing() and |
// destroy it in StopSyncing(). |
- scoped_ptr<SyncErrorFactory> error_handler_; |
+ scoped_ptr<csync::SyncErrorFactory> error_handler_; |
DISALLOW_COPY_AND_ASSIGN(AutocompleteSyncableService); |
}; |