| Index: extensions/common/extension_l10n_util_unittest.cc
|
| diff --git a/extensions/common/extension_l10n_util_unittest.cc b/extensions/common/extension_l10n_util_unittest.cc
|
| index 03feeabbd373e4b2b2ea65f167e4b3fa7e98027b..17daf7c115677ef0a158776e76bfa74db2dca6f0 100644
|
| --- a/extensions/common/extension_l10n_util_unittest.cc
|
| +++ b/extensions/common/extension_l10n_util_unittest.cc
|
| @@ -134,7 +134,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsValidFallback) {
|
|
|
| scoped_ptr<MessageBundle> bundle(extension_l10n_util::LoadMessageCatalogs(
|
| install_dir, "sr", "en_US", locales, &error));
|
| - ASSERT_FALSE(NULL == bundle.get());
|
| + ASSERT_FALSE(nullptr == bundle.get());
|
| EXPECT_TRUE(error.empty());
|
| EXPECT_EQ("Color", bundle->GetL10nMessage("color"));
|
| EXPECT_EQ("Not in the US or GB.", bundle->GetL10nMessage("not_in_US_or_GB"));
|
| @@ -151,8 +151,8 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsMissingFiles) {
|
| valid_locales.insert("sr");
|
| valid_locales.insert("en");
|
| std::string error;
|
| - EXPECT_TRUE(NULL == extension_l10n_util::LoadMessageCatalogs(
|
| - src_path, "en", "sr", valid_locales, &error));
|
| + EXPECT_TRUE(nullptr == extension_l10n_util::LoadMessageCatalogs(
|
| + src_path, "en", "sr", valid_locales, &error));
|
| EXPECT_FALSE(error.empty());
|
| }
|
|
|
| @@ -174,8 +174,8 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsBadJSONFormat) {
|
| valid_locales.insert("sr");
|
| valid_locales.insert("en_US");
|
| std::string error;
|
| - EXPECT_TRUE(NULL == extension_l10n_util::LoadMessageCatalogs(
|
| - src_path, "en_US", "sr", valid_locales, &error));
|
| + EXPECT_TRUE(nullptr == extension_l10n_util::LoadMessageCatalogs(
|
| + src_path, "en_US", "sr", valid_locales, &error));
|
| EXPECT_EQ(ErrorUtils::FormatErrorMessage(
|
| errors::kLocalesInvalidLocale,
|
| base::UTF16ToUTF8(messages_file.LossyDisplayName()),
|
| @@ -214,7 +214,7 @@ TEST(ExtensionL10nUtil, LoadMessageCatalogsDuplicateKeys) {
|
| scoped_ptr<MessageBundle> message_bundle(
|
| extension_l10n_util::LoadMessageCatalogs(
|
| src_path, "en", "sr", valid_locales, &error));
|
| - EXPECT_TRUE(NULL != message_bundle.get());
|
| + EXPECT_TRUE(nullptr != message_bundle.get());
|
| EXPECT_TRUE(error.empty());
|
| }
|
|
|
| @@ -599,7 +599,7 @@ TEST(ExtensionL10nUtil, LocalizeManifestWithSearchProviderMsgs) {
|
|
|
| // Try with NULL manifest.
|
| TEST(ExtensionL10nUtil, ShouldRelocalizeManifestWithNullManifest) {
|
| - EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(NULL));
|
| + EXPECT_FALSE(extension_l10n_util::ShouldRelocalizeManifest(nullptr));
|
| }
|
|
|
| // Try with default and current locales missing.
|
|
|