| Index: extensions/browser/api/api_resource_manager_unittest.cc
|
| diff --git a/extensions/browser/api/api_resource_manager_unittest.cc b/extensions/browser/api/api_resource_manager_unittest.cc
|
| index d9b6cba2f7765887ae90b35284ee8678a76d56ad..b5d00d51b5bf059735a85e353eb484eeb8bcff38 100644
|
| --- a/extensions/browser/api/api_resource_manager_unittest.cc
|
| +++ b/extensions/browser/api/api_resource_manager_unittest.cc
|
| @@ -39,7 +39,7 @@ class FakeApiResource : public ApiResource {
|
|
|
| TEST_F(ApiResourceManagerUnitTest, TwoAppsCannotShareResources) {
|
| scoped_ptr<ApiResourceManager<FakeApiResource> > manager(
|
| - new ApiResourceManager<FakeApiResource>(NULL));
|
| + new ApiResourceManager<FakeApiResource>(nullptr));
|
| scoped_refptr<extensions::Extension> extension_one =
|
| test_util::CreateEmptyExtension("one");
|
| scoped_refptr<extensions::Extension> extension_two =
|
| @@ -54,15 +54,15 @@ TEST_F(ApiResourceManagerUnitTest, TwoAppsCannotShareResources) {
|
| CHECK(resource_two_id);
|
|
|
| // Confirm each extension can get its own resource.
|
| - ASSERT_TRUE(manager->Get(extension_one_id, resource_one_id) != NULL);
|
| - ASSERT_TRUE(manager->Get(extension_two_id, resource_two_id) != NULL);
|
| + ASSERT_TRUE(manager->Get(extension_one_id, resource_one_id) != nullptr);
|
| + ASSERT_TRUE(manager->Get(extension_two_id, resource_two_id) != nullptr);
|
|
|
| // Confirm neither extension can get the other's resource.
|
| - ASSERT_TRUE(manager->Get(extension_one_id, resource_two_id) == NULL);
|
| - ASSERT_TRUE(manager->Get(extension_two_id, resource_one_id) == NULL);
|
| + ASSERT_TRUE(manager->Get(extension_one_id, resource_two_id) == nullptr);
|
| + ASSERT_TRUE(manager->Get(extension_two_id, resource_one_id) == nullptr);
|
|
|
| // And make sure we're not susceptible to any Jedi mind tricks.
|
| - ASSERT_TRUE(manager->Get(std::string(), resource_one_id) == NULL);
|
| + ASSERT_TRUE(manager->Get(std::string(), resource_one_id) == nullptr);
|
| }
|
|
|
| } // namespace extensions
|
|
|