diff options
Diffstat (limited to 'sync/protocol/proto_value_conversions_unittest.cc')
| -rw-r--r-- | sync/protocol/proto_value_conversions_unittest.cc | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sync/protocol/proto_value_conversions_unittest.cc b/sync/protocol/proto_value_conversions_unittest.cc index b33366f..79d4886 100644 --- a/sync/protocol/proto_value_conversions_unittest.cc +++ b/sync/protocol/proto_value_conversions_unittest.cc @@ -42,9 +42,9 @@ class ProtoValueConversionsTest : public testing::Test { protected: template <class T> void TestSpecificsToValue( - DictionaryValue* (*specifics_to_value)(const T&)) { + base::DictionaryValue* (*specifics_to_value)(const T&)) { const T& specifics(T::default_instance()); - scoped_ptr<DictionaryValue> value(specifics_to_value(specifics)); + scoped_ptr<base::DictionaryValue> value(specifics_to_value(specifics)); // We can't do much but make sure that this doesn't crash. } }; @@ -85,7 +85,8 @@ TEST_F(ProtoValueConversionsTest, TabNavigationToValue) { TEST_F(ProtoValueConversionsTest, PasswordSpecificsData) { sync_pb::PasswordSpecificsData specifics; specifics.set_password_value("secret"); - scoped_ptr<DictionaryValue> value(PasswordSpecificsDataToValue(specifics)); + scoped_ptr<base::DictionaryValue> value( + PasswordSpecificsDataToValue(specifics)); EXPECT_FALSE(value->empty()); std::string password_value; EXPECT_TRUE(value->GetString("password_value", &password_value)); @@ -100,7 +101,7 @@ TEST_F(ProtoValueConversionsTest, AppSettingSpecificsToValue) { sync_pb::AppNotificationSettings specifics; specifics.set_disabled(true); specifics.set_oauth_client_id("some_id_value"); - scoped_ptr<DictionaryValue> value(AppSettingsToValue(specifics)); + scoped_ptr<base::DictionaryValue> value(AppSettingsToValue(specifics)); EXPECT_FALSE(value->empty()); bool disabled_value = false; std::string oauth_client_id_value; @@ -132,7 +133,7 @@ TEST_F(ProtoValueConversionsTest, BookmarkSpecificsData) { sync_pb::BookmarkSpecifics specifics; specifics.set_creation_time_us(creation_time.ToInternalValue()); specifics.set_icon_url(icon_url); - scoped_ptr<DictionaryValue> value(BookmarkSpecificsToValue(specifics)); + scoped_ptr<base::DictionaryValue> value(BookmarkSpecificsToValue(specifics)); EXPECT_FALSE(value->empty()); std::string encoded_time; EXPECT_TRUE(value->GetString("creation_time_us", &encoded_time)); @@ -254,7 +255,7 @@ TEST_F(ProtoValueConversionsTest, EntitySpecificsToValue) { #undef SET_FIELD - scoped_ptr<DictionaryValue> value(EntitySpecificsToValue(specifics)); + scoped_ptr<base::DictionaryValue> value(EntitySpecificsToValue(specifics)); EXPECT_EQ(MODEL_TYPE_COUNT - FIRST_REAL_MODEL_TYPE - (LAST_PROXY_TYPE - FIRST_PROXY_TYPE + 1), static_cast<int>(value->size())); @@ -263,11 +264,11 @@ TEST_F(ProtoValueConversionsTest, EntitySpecificsToValue) { namespace { // Returns whether the given value has specifics under the entries in the given // path. -bool ValueHasSpecifics(const DictionaryValue& value, +bool ValueHasSpecifics(const base::DictionaryValue& value, const std::string& path) { - const ListValue* entities_list = NULL; - const DictionaryValue* entry_dictionary = NULL; - const DictionaryValue* specifics_dictionary = NULL; + const base::ListValue* entities_list = NULL; + const base::DictionaryValue* entry_dictionary = NULL; + const base::DictionaryValue* specifics_dictionary = NULL; if (!value.GetList(path, &entities_list)) return false; @@ -288,13 +289,13 @@ TEST_F(ProtoValueConversionsTest, ClientToServerMessageToValue) { sync_pb::SyncEntity* entity = commit_message->add_entries(); entity->mutable_specifics(); - scoped_ptr<DictionaryValue> value_with_specifics( + scoped_ptr<base::DictionaryValue> value_with_specifics( ClientToServerMessageToValue(message, true /* include_specifics */)); EXPECT_FALSE(value_with_specifics->empty()); EXPECT_TRUE(ValueHasSpecifics(*(value_with_specifics.get()), "commit.entries")); - scoped_ptr<DictionaryValue> value_without_specifics( + scoped_ptr<base::DictionaryValue> value_without_specifics( ClientToServerMessageToValue(message, false /* include_specifics */)); EXPECT_FALSE(value_without_specifics->empty()); EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()), @@ -309,13 +310,13 @@ TEST_F(ProtoValueConversionsTest, ClientToServerResponseToValue) { sync_pb::SyncEntity* entity = response->add_entries(); entity->mutable_specifics(); - scoped_ptr<DictionaryValue> value_with_specifics( + scoped_ptr<base::DictionaryValue> value_with_specifics( ClientToServerResponseToValue(message, true /* include_specifics */)); EXPECT_FALSE(value_with_specifics->empty()); EXPECT_TRUE(ValueHasSpecifics(*(value_with_specifics.get()), "get_updates.entries")); - scoped_ptr<DictionaryValue> value_without_specifics( + scoped_ptr<base::DictionaryValue> value_without_specifics( ClientToServerResponseToValue(message, false /* include_specifics */)); EXPECT_FALSE(value_without_specifics->empty()); EXPECT_FALSE(ValueHasSpecifics(*(value_without_specifics.get()), |