| Index: chrome/browser/extensions/settings/settings_sync_util.cc
|
| diff --git a/chrome/browser/extensions/settings/settings_sync_util.cc b/chrome/browser/extensions/settings/settings_sync_util.cc
|
| index 53c2d243d04d19cae144e75a11984053194445e6..1a6ff7496a1573966fca08e3d9bb6ffb502e7d39 100644
|
| --- a/chrome/browser/extensions/settings/settings_sync_util.cc
|
| +++ b/chrome/browser/extensions/settings/settings_sync_util.cc
|
| @@ -41,7 +41,7 @@ void PopulateAppSettingSpecifics(
|
|
|
| } // namespace
|
|
|
| -csync::SyncData CreateData(
|
| +syncer::SyncData CreateData(
|
| const std::string& extension_id,
|
| const std::string& key,
|
| const Value& value,
|
| @@ -68,37 +68,37 @@ csync::SyncData CreateData(
|
| NOTREACHED();
|
| }
|
|
|
| - return csync::SyncData::CreateLocalData(
|
| + return syncer::SyncData::CreateLocalData(
|
| extension_id + "/" + key, key, specifics);
|
| }
|
|
|
| -csync::SyncChange CreateAdd(
|
| +syncer::SyncChange CreateAdd(
|
| const std::string& extension_id,
|
| const std::string& key,
|
| const Value& value,
|
| syncable::ModelType type) {
|
| - return csync::SyncChange(
|
| - csync::SyncChange::ACTION_ADD,
|
| + return syncer::SyncChange(
|
| + syncer::SyncChange::ACTION_ADD,
|
| CreateData(extension_id, key, value, type));
|
| }
|
|
|
| -csync::SyncChange CreateUpdate(
|
| +syncer::SyncChange CreateUpdate(
|
| const std::string& extension_id,
|
| const std::string& key,
|
| const Value& value,
|
| syncable::ModelType type) {
|
| - return csync::SyncChange(
|
| - csync::SyncChange::ACTION_UPDATE,
|
| + return syncer::SyncChange(
|
| + syncer::SyncChange::ACTION_UPDATE,
|
| CreateData(extension_id, key, value, type));
|
| }
|
|
|
| -csync::SyncChange CreateDelete(
|
| +syncer::SyncChange CreateDelete(
|
| const std::string& extension_id,
|
| const std::string& key,
|
| syncable::ModelType type) {
|
| DictionaryValue no_value;
|
| - return csync::SyncChange(
|
| - csync::SyncChange::ACTION_DELETE,
|
| + return syncer::SyncChange(
|
| + syncer::SyncChange::ACTION_DELETE,
|
| CreateData(extension_id, key, no_value, type));
|
| }
|
|
|
|
|