| Index: extensions/browser/extension_registry_unittest.cc
|
| diff --git a/extensions/browser/extension_registry_unittest.cc b/extensions/browser/extension_registry_unittest.cc
|
| index 37bf40d500d6fe46510e7227f5a75c4b5303e82a..6ea6c280bbe2699dc4439e69b137c5bc44823b64 100644
|
| --- a/extensions/browser/extension_registry_unittest.cc
|
| +++ b/extensions/browser/extension_registry_unittest.cc
|
| @@ -87,7 +87,7 @@ class TestObserver : public ExtensionRegistryObserver {
|
| };
|
|
|
| TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
|
| - ExtensionRegistry registry(NULL);
|
| + ExtensionRegistry registry(nullptr);
|
| scoped_refptr<Extension> extension1 = test_util::CreateEmptyExtension("id1");
|
| scoped_refptr<Extension> extension2 = test_util::CreateEmptyExtension("id2");
|
| scoped_refptr<Extension> extension3 = test_util::CreateEmptyExtension("id3");
|
| @@ -121,7 +121,7 @@ TEST_F(ExtensionRegistryTest, FillAndClearRegistry) {
|
|
|
| // A simple test of adding and removing things from sets.
|
| TEST_F(ExtensionRegistryTest, AddAndRemoveExtensionFromRegistry) {
|
| - ExtensionRegistry registry(NULL);
|
| + ExtensionRegistry registry(nullptr);
|
|
|
| // Adding an extension works.
|
| scoped_refptr<Extension> extension = test_util::CreateEmptyExtension("id");
|
| @@ -142,7 +142,7 @@ TEST_F(ExtensionRegistryTest, AddAndRemoveExtensionFromRegistry) {
|
| }
|
|
|
| TEST_F(ExtensionRegistryTest, AddExtensionToRegistryTwice) {
|
| - ExtensionRegistry registry(NULL);
|
| + ExtensionRegistry registry(nullptr);
|
| scoped_refptr<Extension> extension = test_util::CreateEmptyExtension("id");
|
|
|
| // An extension can exist in two sets at once. It would be nice to eliminate
|
| @@ -157,7 +157,7 @@ TEST_F(ExtensionRegistryTest, AddExtensionToRegistryTwice) {
|
| }
|
|
|
| TEST_F(ExtensionRegistryTest, GetExtensionById) {
|
| - ExtensionRegistry registry(NULL);
|
| + ExtensionRegistry registry(nullptr);
|
|
|
| // Trying to get an extension fails cleanly when the sets are empty.
|
| EXPECT_FALSE(
|
| @@ -235,7 +235,7 @@ TEST_F(ExtensionRegistryTest, GetExtensionById) {
|
| }
|
|
|
| TEST_F(ExtensionRegistryTest, Observer) {
|
| - ExtensionRegistry registry(NULL);
|
| + ExtensionRegistry registry(nullptr);
|
| TestObserver observer;
|
| registry.AddObserver(&observer);
|
|
|
|
|