Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: chrome/browser/extensions/settings/settings_backend.cc

Issue 9427001: Extend TwoClientExtensionSettingsSyncTest to test app settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/settings/settings_backend.cc
diff --git a/chrome/browser/extensions/settings/settings_backend.cc b/chrome/browser/extensions/settings/settings_backend.cc
index 70ccfe017cb43cccf7d3a73c74f82e80e4da7372..1ee4516dfc7008dcf25bab5dd8b4ce210ea64e9d 100644
--- a/chrome/browser/extensions/settings/settings_backend.cc
+++ b/chrome/browser/extensions/settings/settings_backend.cc
@@ -133,10 +133,11 @@ std::set<std::string> SettingsBackend::GetKnownExtensionIDs() const {
static void AddAllSyncData(
const std::string& extension_id,
const DictionaryValue& src,
+ syncable::ModelType type,
SyncDataList* dst) {
for (DictionaryValue::Iterator it(src); it.HasNext(); it.Advance()) {
- dst->push_back(
- settings_sync_util::CreateData(extension_id, it.key(), it.value()));
+ dst->push_back(settings_sync_util::CreateData(
+ extension_id, it.key(), it.value(), type));
}
}
@@ -161,7 +162,7 @@ SyncDataList SettingsBackend::GetAllSyncData(
maybe_settings.error();
continue;
}
- AddAllSyncData(*it, maybe_settings.settings(), &all_sync_data);
+ AddAllSyncData(*it, maybe_settings.settings(), type, &all_sync_data);
}
return all_sync_data;

Powered by Google App Engine
This is Rietveld 408576698