| Index: chrome/browser/sync/glue/typed_url_change_processor.h
|
| diff --git a/chrome/browser/sync/glue/typed_url_change_processor.h b/chrome/browser/sync/glue/typed_url_change_processor.h
|
| index 97f5d72ca026c4d7fba37f6a7fdd8df8a47cb993..23743707229bc9b97d36c5bcefc00f59c9a3e02f 100644
|
| --- a/chrome/browser/sync/glue/typed_url_change_processor.h
|
| +++ b/chrome/browser/sync/glue/typed_url_change_processor.h
|
| @@ -39,7 +39,7 @@ namespace browser_sync {
|
| class DataTypeErrorHandler;
|
|
|
| // This class is responsible for taking changes from the history backend and
|
| -// applying them to the csync 'syncable' model, and vice versa. All
|
| +// applying them to the sync API 'syncable' model, and vice versa. All
|
| // operations and use of this class are from the UI thread.
|
| class TypedUrlChangeProcessor : public ChangeProcessor,
|
| public content::NotificationObserver {
|
| @@ -51,15 +51,15 @@ class TypedUrlChangeProcessor : public ChangeProcessor,
|
| virtual ~TypedUrlChangeProcessor();
|
|
|
| // content::NotificationObserver implementation.
|
| - // History -> csync model change application.
|
| + // History -> sync API change application.
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // csync model -> WebDataService change application.
|
| + // sync API model -> WebDataService change application.
|
| virtual void ApplyChangesFromSyncModel(
|
| - const csync::BaseTransaction* trans,
|
| - const csync::ImmutableChangeRecordList& changes) OVERRIDE;
|
| + const syncer::BaseTransaction* trans,
|
| + const syncer::ImmutableChangeRecordList& changes) OVERRIDE;
|
|
|
| // Commit changes here, after we've released the transaction lock to avoid
|
| // jank.
|
| @@ -88,7 +88,7 @@ class TypedUrlChangeProcessor : public ChangeProcessor,
|
| // new one for the passed |typed_url| if one does not already exist. Returns
|
| // false and sets an unrecoverable error if the operation failed.
|
| bool CreateOrUpdateSyncNode(history::URLRow typed_url,
|
| - csync::WriteTransaction* transaction);
|
| + syncer::WriteTransaction* transaction);
|
|
|
| // The profile with which we are associated.
|
| Profile* profile_;
|
|
|