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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 years, 6 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/automation/testing_automation_provider.cc
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 6dbd5c7bea02810d2abee21f13486ee94c989980..b7c77a51da3509d9872c998b9d725c6d9ce848f6 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -4844,12 +4844,12 @@ void TestingAutomationProvider::GetSyncInfo(Browser* browser,
sync_info->SetString("last synced", service->GetLastSyncedTimeString());
sync_info->SetInteger("updates received", status.updates_received);
ListValue* synced_datatype_list = new ListValue;
- const syncable::ModelTypeSet synced_datatypes =
+ const syncer::ModelTypeSet synced_datatypes =
service->GetPreferredDataTypes();
- for (syncable::ModelTypeSet::Iterator it = synced_datatypes.First();
+ for (syncer::ModelTypeSet::Iterator it = synced_datatypes.First();
it.Good(); it.Inc()) {
synced_datatype_list->Append(
- new StringValue(syncable::ModelTypeToString(it.Get())));
+ new StringValue(syncer::ModelTypeToString(it.Get())));
}
sync_info->Set("synced datatypes", synced_datatype_list);
}
@@ -4950,9 +4950,9 @@ void TestingAutomationProvider::EnableSyncForDatatypes(
for (int i = 0; i < num_datatypes; ++i) {
std::string datatype_string;
datatypes->GetString(i, &datatype_string);
- syncable::ModelType datatype =
- syncable::ModelTypeFromString(datatype_string);
- if (datatype == syncable::UNSPECIFIED) {
+ syncer::ModelType datatype =
+ syncer::ModelTypeFromString(datatype_string);
+ if (datatype == syncer::UNSPECIFIED) {
AutomationJSONReply(this, reply_message).SendError(StringPrintf(
"Invalid datatype string: %s.", datatype_string.c_str()));
return;
@@ -4999,9 +4999,9 @@ void TestingAutomationProvider::DisableSyncForDatatypes(
for (int i = 0; i < num_datatypes; i++) {
std::string datatype_string;
datatypes->GetString(i, &datatype_string);
- syncable::ModelType datatype =
- syncable::ModelTypeFromString(datatype_string);
- if (datatype == syncable::UNSPECIFIED) {
+ syncer::ModelType datatype =
+ syncer::ModelTypeFromString(datatype_string);
+ if (datatype == syncer::UNSPECIFIED) {
AutomationJSONReply(this, reply_message).SendError(StringPrintf(
"Invalid datatype string: %s.", datatype_string.c_str()));
return;
« no previous file with comments | « chrome/browser/autofill/autofill_manager_unittest.cc ('k') | chrome/browser/extensions/app_notification_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698