Index: components/sync/engine_impl/commit_util.cc |
diff --git a/components/sync/engine_impl/commit_util.cc b/components/sync/engine_impl/commit_util.cc |
index 8eeef48b9cbbb5229b4945a55771f25dae3db22e..ed3387a055b1eed8677f803fc23429a2aff3671b 100644 |
--- a/components/sync/engine_impl/commit_util.cc |
+++ b/components/sync/engine_impl/commit_util.cc |
@@ -34,8 +34,8 @@ using std::vector; |
namespace syncer { |
-using syncable::Entry; |
-using syncable::Id; |
+using syncer::syncable::Entry; |
+using syncer::syncable::Id; |
namespace commit_util { |
@@ -74,8 +74,7 @@ void AddClientConfigParamsToMessage(ModelTypeSet enabled_types, |
int field_number = GetSpecificsFieldNumberFromModelType(it.Get()); |
config_params->mutable_enabled_type_ids()->Add(field_number); |
} |
- config_params->set_tabs_datatype_enabled( |
- enabled_types.Has(syncer::PROXY_TABS)); |
+ config_params->set_tabs_datatype_enabled(enabled_types.Has(PROXY_TABS)); |
config_params->set_cookie_jar_mismatch(cookie_jar_mismatch); |
} |