| Index: extensions/browser/image_loader_unittest.cc
|
| diff --git a/extensions/browser/image_loader_unittest.cc b/extensions/browser/image_loader_unittest.cc
|
| index 74b9cccc52f73f6551984da01e432dbfc69a8ca5..d3551f90a26ada2c6c4e2cb32dbc9d4e8797158e 100644
|
| --- a/extensions/browser/image_loader_unittest.cc
|
| +++ b/extensions/browser/image_loader_unittest.cc
|
| @@ -74,7 +74,7 @@ class ImageLoaderTest : public testing::Test {
|
| base::FilePath extension_dir;
|
| if (!PathService::Get(DIR_TEST_DATA, &extension_dir)) {
|
| EXPECT_FALSE(true);
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| extension_dir = extension_dir.AppendASCII(dir_name);
|
| int error_code = 0;
|
| @@ -86,11 +86,11 @@ class ImageLoaderTest : public testing::Test {
|
| &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(
|
| extension_dir, location, *valid_value, Extension::NO_FLAGS, &error);
|
| @@ -119,7 +119,7 @@ class ImageLoaderTest : public testing::Test {
|
| TEST_F(ImageLoaderTest, LoadImage) {
|
| scoped_refptr<Extension> extension(
|
| CreateExtension("image_loader", Manifest::INVALID_LOCATION));
|
| - ASSERT_TRUE(extension.get() != NULL);
|
| + ASSERT_TRUE(extension.get() != nullptr);
|
|
|
| ExtensionResource image_resource =
|
| IconsInfo::GetIconResource(extension.get(),
|
| @@ -153,7 +153,7 @@ TEST_F(ImageLoaderTest, LoadImage) {
|
| TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
|
| scoped_refptr<Extension> extension(
|
| CreateExtension("image_loader", Manifest::INVALID_LOCATION));
|
| - ASSERT_TRUE(extension.get() != NULL);
|
| + ASSERT_TRUE(extension.get() != nullptr);
|
|
|
| ExtensionResource image_resource =
|
| IconsInfo::GetIconResource(extension.get(),
|
| @@ -183,7 +183,7 @@ TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
|
|
|
| // Chuck the extension, that way if anyone tries to access it we should crash
|
| // or get valgrind errors.
|
| - extension = NULL;
|
| + extension = nullptr;
|
|
|
| WaitForImageLoad();
|
|
|
| @@ -200,7 +200,7 @@ TEST_F(ImageLoaderTest, DeleteExtensionWhileWaitingForCache) {
|
| TEST_F(ImageLoaderTest, MultipleImages) {
|
| scoped_refptr<Extension> extension(
|
| CreateExtension("image_loader", Manifest::INVALID_LOCATION));
|
| - ASSERT_TRUE(extension.get() != NULL);
|
| + ASSERT_TRUE(extension.get() != nullptr);
|
|
|
| std::vector<ImageLoader::ImageRepresentation> info_list;
|
| int sizes[] = {extension_misc::EXTENSION_ICON_BITTY,
|
| @@ -245,7 +245,7 @@ TEST_F(ImageLoaderTest, MultipleImages) {
|
| TEST_F(ImageLoaderTest, LoadImageFamily) {
|
| scoped_refptr<Extension> extension(
|
| CreateExtension("image_loader", Manifest::INVALID_LOCATION));
|
| - ASSERT_TRUE(extension.get() != NULL);
|
| + ASSERT_TRUE(extension.get() != nullptr);
|
|
|
| std::vector<ImageLoader::ImageRepresentation> info_list;
|
| int sizes[] = {extension_misc::EXTENSION_ICON_BITTY,
|
|
|