diff options
Diffstat (limited to 'sync/internal_api/public/base')
6 files changed, 19 insertions, 95 deletions
diff --git a/sync/internal_api/public/base/model_type.h b/sync/internal_api/public/base/model_type.h index 77c2344..c8b1948 100644 --- a/sync/internal_api/public/base/model_type.h +++ b/sync/internal_api/public/base/model_type.h @@ -30,8 +30,6 @@ class SyncEntity; namespace syncer { -namespace syncable { - enum ModelType { // Object type unknown. Objects may transition through // the unknown state during their initial creation, before @@ -103,7 +101,7 @@ inline ModelType ModelTypeFromInt(int i) { return static_cast<ModelType>(i); } -void AddDefaultFieldValue(syncable::ModelType datatype, +void AddDefaultFieldValue(ModelType datatype, sync_pb::EntitySpecifics* specifics); // Extract the model type of a SyncEntity protocol buffer. ModelType is a @@ -172,56 +170,6 @@ bool NotificationTypeToRealModelType(const std::string& notification_type, // Returns true if |model_type| is a real datatype bool IsRealDataType(ModelType model_type); -} // namespace syncable - } // namespace syncer -// TODO(akalin): Move the names below to the 'syncer' namespace once -// we move this file to public/base. -namespace syncable { - -using syncer::syncable::ModelType; -using syncer::syncable::ModelTypeSet; -using syncer::syncable::FullModelTypeSet; -using syncer::syncable::UNSPECIFIED; -using syncer::syncable::TOP_LEVEL_FOLDER; -using syncer::syncable::BOOKMARKS; -using syncer::syncable::FIRST_REAL_MODEL_TYPE; -using syncer::syncable::PREFERENCES; -using syncer::syncable::PASSWORDS; -using syncer::syncable::AUTOFILL_PROFILE; -using syncer::syncable::AUTOFILL; -using syncer::syncable::THEMES; -using syncer::syncable::TYPED_URLS; -using syncer::syncable::EXTENSIONS; -using syncer::syncable::NIGORI; -using syncer::syncable::SEARCH_ENGINES; -using syncer::syncable::SESSIONS; -using syncer::syncable::APPS; -using syncer::syncable::APP_SETTINGS; -using syncer::syncable::EXTENSION_SETTINGS; -using syncer::syncable::APP_NOTIFICATIONS; -using syncer::syncable::LAST_REAL_MODEL_TYPE; -using syncer::syncable::MODEL_TYPE_COUNT; -using syncer::syncable::ModelTypeFromInt; -using syncer::syncable::AddDefaultFieldValue; -using syncer::syncable::GetModelType; -using syncer::syncable::GetModelTypeFromSpecifics; -using syncer::syncable::ShouldMaintainPosition; -using syncer::syncable::GetModelTypeFromSpecificsFieldNumber; -using syncer::syncable::GetSpecificsFieldNumberFromModelType; -using syncer::syncable::ModelTypeToString; -using syncer::syncable::ModelTypeToValue; -using syncer::syncable::ModelTypeFromValue; -using syncer::syncable::ModelTypeFromString; -using syncer::syncable::ModelTypeSetToString; -using syncer::syncable::ModelTypeSetToValue; -using syncer::syncable::ModelTypeSetFromValue; -using syncer::syncable::ModelTypeToRootTag; -using syncer::syncable::RealModelTypeToNotificationType; -using syncer::syncable::NotificationTypeToRealModelType; -using syncer::syncable::IsRealDataType; - -} // namespace syncable - #endif // SYNC_INTERNAL_API_PUBLIC_BASE_MODEL_TYPE_H_ diff --git a/sync/internal_api/public/base/model_type_payload_map.cc b/sync/internal_api/public/base/model_type_payload_map.cc index 8fb458c..04222ee 100644 --- a/sync/internal_api/public/base/model_type_payload_map.cc +++ b/sync/internal_api/public/base/model_type_payload_map.cc @@ -12,13 +12,12 @@ #include "base/values.h" namespace syncer { -namespace syncable { ModelTypePayloadMap ModelTypePayloadMapFromEnumSet( - syncable::ModelTypeSet types, + syncer::ModelTypeSet types, const std::string& payload) { ModelTypePayloadMap types_with_payloads; - for (syncable::ModelTypeSet::Iterator it = types.First(); + for (syncer::ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) { types_with_payloads[it.Get()] = payload; } @@ -53,7 +52,7 @@ DictionaryValue* ModelTypePayloadMapToValue( std::string base64_marker; bool encoded = base::Base64Encode(it->second, &base64_marker); DCHECK(encoded); - value->SetString(syncable::ModelTypeToString(it->first), base64_marker); + value->SetString(syncer::ModelTypeToString(it->first), base64_marker); } return value; } @@ -74,6 +73,4 @@ void CoalescePayloads(ModelTypePayloadMap* original, } } -} // namespace syncable } // namespace syncer - diff --git a/sync/internal_api/public/base/model_type_payload_map.h b/sync/internal_api/public/base/model_type_payload_map.h index b95e152..da708f7 100644 --- a/sync/internal_api/public/base/model_type_payload_map.h +++ b/sync/internal_api/public/base/model_type_payload_map.h @@ -18,7 +18,6 @@ class DictionaryValue; } namespace syncer { -namespace syncable { // A container that contains a set of datatypes with possible string // payloads. @@ -46,20 +45,6 @@ base::DictionaryValue* ModelTypePayloadMapToValue( void CoalescePayloads(ModelTypePayloadMap* original, const ModelTypePayloadMap& update); -} // namespace syncable } // namespace syncer -// TODO(akalin): Move the names below to the 'syncer' namespace once -// we move this file to public/base. -namespace syncable { - -using ::syncer::syncable::ModelTypePayloadMap; -using ::syncer::syncable::ModelTypePayloadMapFromEnumSet; -using ::syncer::syncable::ModelTypePayloadMapToEnumSet; -using ::syncer::syncable::ModelTypePayloadMapToString; -using ::syncer::syncable::ModelTypePayloadMapToValue; -using ::syncer::syncable::CoalescePayloads; - -} // namespace syncable - #endif // SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_PAYLOAD_MAP_H_ diff --git a/sync/internal_api/public/base/model_type_payload_map_unittest.cc b/sync/internal_api/public/base/model_type_payload_map_unittest.cc index 485048d..1a20867 100644 --- a/sync/internal_api/public/base/model_type_payload_map_unittest.cc +++ b/sync/internal_api/public/base/model_type_payload_map_unittest.cc @@ -13,7 +13,6 @@ #include "testing/gtest/include/gtest/gtest.h" namespace syncer { -namespace syncable { namespace { using base::ExpectDictStringValue; @@ -44,32 +43,31 @@ TEST_F(ModelTypePayloadMapTest, TypePayloadMapToValue) { } TEST_F(ModelTypePayloadMapTest, CoalescePayloads) { - syncable::ModelTypePayloadMap original; + syncer::ModelTypePayloadMap original; std::string empty_payload; std::string payload1 = "payload1"; std::string payload2 = "payload2"; std::string payload3 = "payload3"; - original[syncable::BOOKMARKS] = empty_payload; - original[syncable::PASSWORDS] = payload1; - original[syncable::AUTOFILL] = payload2; - original[syncable::THEMES] = payload3; + original[syncer::BOOKMARKS] = empty_payload; + original[syncer::PASSWORDS] = payload1; + original[syncer::AUTOFILL] = payload2; + original[syncer::THEMES] = payload3; - syncable::ModelTypePayloadMap update; - update[syncable::BOOKMARKS] = empty_payload; // Same. - update[syncable::PASSWORDS] = empty_payload; // Overwrite with empty. - update[syncable::AUTOFILL] = payload1; // Overwrite with non-empty. - update[syncable::SESSIONS] = payload2; // New. + syncer::ModelTypePayloadMap update; + update[syncer::BOOKMARKS] = empty_payload; // Same. + update[syncer::PASSWORDS] = empty_payload; // Overwrite with empty. + update[syncer::AUTOFILL] = payload1; // Overwrite with non-empty. + update[syncer::SESSIONS] = payload2; // New. // Themes untouched. CoalescePayloads(&original, update); ASSERT_EQ(5U, original.size()); - EXPECT_EQ(empty_payload, original[syncable::BOOKMARKS]); - EXPECT_EQ(payload1, original[syncable::PASSWORDS]); - EXPECT_EQ(payload1, original[syncable::AUTOFILL]); - EXPECT_EQ(payload2, original[syncable::SESSIONS]); - EXPECT_EQ(payload3, original[syncable::THEMES]); + EXPECT_EQ(empty_payload, original[syncer::BOOKMARKS]); + EXPECT_EQ(payload1, original[syncer::PASSWORDS]); + EXPECT_EQ(payload1, original[syncer::AUTOFILL]); + EXPECT_EQ(payload2, original[syncer::SESSIONS]); + EXPECT_EQ(payload3, original[syncer::THEMES]); } } // namespace -} // namespace syncable } // namespace syncer diff --git a/sync/internal_api/public/base/model_type_test_util.cc b/sync/internal_api/public/base/model_type_test_util.cc index 5c07e8c..8c1164b 100644 --- a/sync/internal_api/public/base/model_type_test_util.cc +++ b/sync/internal_api/public/base/model_type_test_util.cc @@ -5,7 +5,6 @@ #include "sync/internal_api/public/base/model_type_test_util.h" namespace syncer { -namespace syncable { void PrintTo(ModelTypeSet model_types, ::std::ostream* os) { *os << ModelTypeSetToString(model_types); @@ -50,5 +49,4 @@ class HasModelTypesMatcher return ::testing::MakeMatcher(new HasModelTypesMatcher(expected_types)); } -} // namespace syncable } // namespace syncer diff --git a/sync/internal_api/public/base/model_type_test_util.h b/sync/internal_api/public/base/model_type_test_util.h index 4f5b804..0bac4b7 100644 --- a/sync/internal_api/public/base/model_type_test_util.h +++ b/sync/internal_api/public/base/model_type_test_util.h @@ -12,7 +12,6 @@ #include "testing/gmock/include/gmock/gmock.h" namespace syncer { -namespace syncable { // Defined for googletest. Forwards to ModelTypeSetToString(). void PrintTo(ModelTypeSet model_types, ::std::ostream* os); @@ -22,7 +21,6 @@ void PrintTo(ModelTypeSet model_types, ::std::ostream* os); // EXPECT_CALL(mock, ProcessModelTypes(HasModelTypes(expected_types))); ::testing::Matcher<ModelTypeSet> HasModelTypes(ModelTypeSet expected_types); -} // namespace syncable } // namespace syncer #endif // SYNC_INTERNAL_PUBLIC_API_BASE_MODEL_TYPE_TEST_UTIL_H_ |