Index: extensions/common/message_bundle_unittest.cc |
diff --git a/extensions/common/message_bundle_unittest.cc b/extensions/common/message_bundle_unittest.cc |
index 3f332fc7f53fad4494166639a47c00e3045712b3..b5e0bdaa96e2f988ed30a3d3ecc9d59bbc80c1e4 100644 |
--- a/extensions/common/message_bundle_unittest.cc |
+++ b/extensions/common/message_bundle_unittest.cc |
@@ -97,7 +97,7 @@ class MessageBundleTest : public testing::Test { |
} |
break; |
case MISSING_MESSAGE: |
- dict->Remove("n1.message", NULL); |
+ dict->Remove("n1.message", nullptr); |
break; |
case PLACEHOLDER_NOT_A_TREE: |
dict->SetString("n1.placeholders", "whatever"); |
@@ -108,11 +108,11 @@ class MessageBundleTest : public testing::Test { |
} |
break; |
case CONTENT_MISSING: |
- dict->Remove("n1.placeholders.a.content", NULL); |
+ dict->Remove("n1.placeholders.a.content", nullptr); |
break; |
case MESSAGE_PLACEHOLDER_DOESNT_MATCH: |
base::DictionaryValue* value; |
- dict->Remove("n1.placeholders.a", NULL); |
+ dict->Remove("n1.placeholders.a", nullptr); |
dict->GetDictionary("n1.placeholders", &value); |
CreateContentTree("x", "X", value); |
break; |
@@ -167,7 +167,7 @@ TEST_F(MessageBundleTest, ReservedMessagesCount) { |
TEST_F(MessageBundleTest, InitEmptyDictionaries) { |
CreateMessageBundle(); |
- EXPECT_TRUE(handler_.get() != NULL); |
+ EXPECT_TRUE(handler_.get() != nullptr); |
EXPECT_EQ(0U + ReservedMessagesCount(), handler_->size()); |
CheckReservedMessages(handler_.get()); |
} |
@@ -177,7 +177,7 @@ TEST_F(MessageBundleTest, InitGoodDefaultDict) { |
linked_ptr<base::DictionaryValue>(CreateGoodDictionary())); |
CreateMessageBundle(); |
- EXPECT_TRUE(handler_.get() != NULL); |
+ EXPECT_TRUE(handler_.get() != nullptr); |
EXPECT_EQ(3U + ReservedMessagesCount(), handler_->size()); |
EXPECT_EQ("message1 A B", handler_->GetL10nMessage("n1")); |
@@ -196,14 +196,14 @@ TEST_F(MessageBundleTest, InitAppDictConsultedFirst) { |
// Flip placeholders in message of n1 tree. |
app_dict->SetString("n1.message", "message1 $b$ $a$"); |
// Remove one message from app dict. |
- app_dict->Remove("n2", NULL); |
+ app_dict->Remove("n2", nullptr); |
// Replace n3 with N3. |
- app_dict->Remove("n3", NULL); |
+ app_dict->Remove("n3", nullptr); |
CreateMessageTree("N3", "message3_app_dict", false, app_dict); |
CreateMessageBundle(); |
- EXPECT_TRUE(handler_.get() != NULL); |
+ EXPECT_TRUE(handler_.get() != nullptr); |
EXPECT_EQ(3U + ReservedMessagesCount(), handler_->size()); |
EXPECT_EQ("message1 B A", handler_->GetL10nMessage("n1")); |
@@ -220,43 +220,43 @@ TEST_F(MessageBundleTest, InitBadAppDict) { |
std::string error = CreateMessageBundle(); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Name of a key \"n 5\" is invalid. Only ASCII [a-z], " |
"[A-Z], [0-9] and \"_\" are allowed.", error); |
catalogs_[0].reset(CreateBadDictionary(NAME_NOT_A_TREE)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Not a valid tree for key n4.", error); |
catalogs_[0].reset(CreateBadDictionary(EMPTY_NAME_TREE)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("There is no \"message\" element for key n4.", error); |
catalogs_[0].reset(CreateBadDictionary(MISSING_MESSAGE)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("There is no \"message\" element for key n1.", error); |
catalogs_[0].reset(CreateBadDictionary(PLACEHOLDER_NOT_A_TREE)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Not a valid \"placeholders\" element for key n1.", error); |
catalogs_[0].reset(CreateBadDictionary(EMPTY_PLACEHOLDER_TREE)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Variable $a$ used but not defined.", error); |
catalogs_[0].reset(CreateBadDictionary(CONTENT_MISSING)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Invalid \"content\" element for key n1.", error); |
catalogs_[0].reset(CreateBadDictionary(MESSAGE_PLACEHOLDER_DOESNT_MATCH)); |
handler_.reset(MessageBundle::Create(catalogs_, &error)); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
EXPECT_EQ("Variable $a$ used but not defined.", error); |
} |
@@ -269,7 +269,7 @@ TEST_F(MessageBundleTest, ReservedMessagesOverrideDeveloperMessages) { |
std::string error = CreateMessageBundle(); |
- EXPECT_TRUE(handler_.get() == NULL); |
+ EXPECT_TRUE(handler_.get() == nullptr); |
std::string expected_error = ErrorUtils::FormatErrorMessage( |
errors::kReservedMessageFound, MessageBundle::kUILocaleKey); |
EXPECT_EQ(expected_error, error); |
@@ -278,7 +278,7 @@ TEST_F(MessageBundleTest, ReservedMessagesOverrideDeveloperMessages) { |
TEST_F(MessageBundleTest, AppendReservedMessagesForLTR) { |
CreateMessageBundle(); |
- ASSERT_TRUE(handler_.get() != NULL); |
+ ASSERT_TRUE(handler_.get() != nullptr); |
ClearDictionary(); |
ASSERT_TRUE(AppendReservedMessages("en_US")); |
@@ -297,7 +297,7 @@ TEST_F(MessageBundleTest, AppendReservedMessagesForLTR) { |
TEST_F(MessageBundleTest, AppendReservedMessagesForRTL) { |
CreateMessageBundle(); |
- ASSERT_TRUE(handler_.get() != NULL); |
+ ASSERT_TRUE(handler_.get() != nullptr); |
ClearDictionary(); |
ASSERT_TRUE(AppendReservedMessages("he")); |
@@ -406,7 +406,7 @@ TEST(MessageBundle, ReplaceMessagesInText) { |
TEST(GetExtensionToL10nMessagesMapTest, ReturnsTheSameObject) { |
ExtensionToL10nMessagesMap* map1 = GetExtensionToL10nMessagesMap(); |
- ASSERT_TRUE(NULL != map1); |
+ ASSERT_TRUE(nullptr != map1); |
ExtensionToL10nMessagesMap* map2 = GetExtensionToL10nMessagesMap(); |
ASSERT_EQ(map1, map2); |
@@ -415,7 +415,7 @@ TEST(GetExtensionToL10nMessagesMapTest, ReturnsTheSameObject) { |
TEST(GetExtensionToL10nMessagesMapTest, ReturnsNullForUnknownExtensionId) { |
const std::string extension_id("some_unique_12334212314234_id"); |
L10nMessagesMap* map = GetL10nMessagesMap(extension_id); |
- EXPECT_TRUE(NULL == map); |
+ EXPECT_TRUE(nullptr == map); |
} |
TEST(GetExtensionToL10nMessagesMapTest, ReturnsMapForKnownExtensionId) { |
@@ -426,7 +426,7 @@ TEST(GetExtensionToL10nMessagesMapTest, ReturnsMapForKnownExtensionId) { |
(*GetExtensionToL10nMessagesMap())[extension_id] = messages; |
L10nMessagesMap* map = GetL10nMessagesMap(extension_id); |
- ASSERT_TRUE(NULL != map); |
+ ASSERT_TRUE(nullptr != map); |
EXPECT_EQ(1U, map->size()); |
EXPECT_EQ("message_value", (*map)["message_name"]); |
} |