Index: extensions/browser/extension_icon_image_unittest.cc |
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc |
index 9cc10a49b1fdd088bed102b1853af0b63ff1ffc8..ee3e91319c20a22124024944f64b7c0c90b535d5 100644 |
--- a/extensions/browser/extension_icon_image_unittest.cc |
+++ b/extensions/browser/extension_icon_image_unittest.cc |
@@ -145,7 +145,7 @@ class ExtensionIconImageTest : public ExtensionsTest, |
base::FilePath test_file; |
if (!PathService::Get(DIR_TEST_DATA, &test_file)) { |
EXPECT_FALSE(true); |
- return NULL; |
+ return nullptr; |
} |
test_file = test_file.AppendASCII(name); |
int error_code = 0; |
@@ -156,11 +156,11 @@ class ExtensionIconImageTest : public ExtensionsTest, |
&error))); |
EXPECT_EQ(0, error_code) << error; |
if (error_code != 0) |
- return NULL; |
+ return nullptr; |
EXPECT_TRUE(valid_value.get()); |
if (!valid_value) |
- return NULL; |
+ return nullptr; |
return Extension::Create(test_file, location, *valid_value, |
Extension::NO_FLAGS, &error); |
@@ -213,7 +213,7 @@ TEST_F(ExtensionIconImageTest, Basic) { |
ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors); |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
@@ -286,7 +286,7 @@ TEST_F(ExtensionIconImageTest, FallbackToSmallerWhenNoBigger) { |
ui::test::ScopedSetSupportedScaleFactors scoped_supported(supported_factors); |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
@@ -323,7 +323,7 @@ TEST_F(ExtensionIconImageTest, FallbackToSmallerWhenNoBigger) { |
TEST_F(ExtensionIconImageTest, FallbackToBigger) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
@@ -359,7 +359,7 @@ TEST_F(ExtensionIconImageTest, FallbackToBigger) { |
TEST_F(ExtensionIconImageTest, NoResources) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
ExtensionIconSet empty_icon_set; |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
@@ -397,7 +397,7 @@ TEST_F(ExtensionIconImageTest, NoResources) { |
TEST_F(ExtensionIconImageTest, InvalidResource) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
const int kInvalidIconSize = 24; |
ExtensionIconSet invalid_icon_set; |
@@ -435,7 +435,7 @@ TEST_F(ExtensionIconImageTest, InvalidResource) { |
TEST_F(ExtensionIconImageTest, LazyDefaultIcon) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
gfx::ImageSkia lazy_default_icon(new MockImageSkiaSource(default_icon), |
@@ -472,7 +472,7 @@ TEST_F(ExtensionIconImageTest, LazyDefaultIcon) { |
TEST_F(ExtensionIconImageTest, LazyDefaultIcon_AsyncIconImage) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
gfx::ImageSkia lazy_default_icon(new MockImageSkiaSource(default_icon), |
@@ -515,7 +515,7 @@ TEST_F(ExtensionIconImageTest, LazyDefaultIcon_AsyncIconImage) { |
TEST_F(ExtensionIconImageTest, IconImageDestruction) { |
scoped_refptr<Extension> extension(CreateExtension( |
"extension_icon_image", Manifest::INVALID_LOCATION)); |
- ASSERT_TRUE(extension.get() != NULL); |
+ ASSERT_TRUE(extension.get() != nullptr); |
gfx::ImageSkia default_icon = GetDefaultIcon(); |
@@ -543,7 +543,7 @@ TEST_F(ExtensionIconImageTest, IconImageDestruction) { |
// Stash loaded image skia, and destroy |image|. |
gfx::ImageSkia image_skia = image->image_skia(); |
image.reset(); |
- extension = NULL; |
+ extension = nullptr; |
// Image skia should still be able to get previously loaded representation. |
representation = image_skia.GetRepresentation(1.0f); |