| Index: extensions/browser/api/storage/settings_quota_unittest.cc
|
| diff --git a/extensions/browser/api/storage/settings_quota_unittest.cc b/extensions/browser/api/storage/settings_quota_unittest.cc
|
| index 2865d66b0fddfe2c0d5156fcd7206eec926719de..b8d2bbd501d2a2a8be8f8cb052a783d34b0d0f96 100644
|
| --- a/extensions/browser/api/storage/settings_quota_unittest.cc
|
| +++ b/extensions/browser/api/storage/settings_quota_unittest.cc
|
| @@ -44,15 +44,13 @@ class ExtensionSettingsQuotaTest : public testing::Test {
|
| ASSERT_EQ(256u, validate_sizes.size());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| - ASSERT_TRUE(storage_.get() != NULL);
|
| - }
|
| + virtual void TearDown() OVERRIDE { ASSERT_TRUE(storage_.get() != nullptr); }
|
|
|
| protected:
|
| // Creates |storage_|. Must only be called once.
|
| void CreateStorage(
|
| size_t quota_bytes, size_t quota_bytes_per_item, size_t max_items) {
|
| - ASSERT_TRUE(storage_.get() == NULL);
|
| + ASSERT_TRUE(storage_.get() == nullptr);
|
| SettingsStorageQuotaEnforcer::Limits limits =
|
| { quota_bytes, quota_bytes_per_item, max_items };
|
| storage_.reset(new SettingsStorageQuotaEnforcer(limits, delegate_));
|
| @@ -193,7 +191,7 @@ TEST_F(ExtensionSettingsQuotaTest, RemovingExistingSettings) {
|
|
|
| // Try again with "b" removed, enough quota.
|
| EXPECT_FALSE(storage_->Remove("b")->HasError());
|
| - settings.Remove("b", NULL);
|
| + settings.Remove("b", nullptr);
|
| EXPECT_FALSE(storage_->Set(DEFAULTS, "c", *byte_value_256_)->HasError());
|
| settings.Set("c", byte_value_256_->DeepCopy());
|
| EXPECT_TRUE(SettingsEqual(settings));
|
| @@ -208,7 +206,7 @@ TEST_F(ExtensionSettingsQuotaTest, RemovingExistingSettings) {
|
|
|
| // Back under max keys.
|
| EXPECT_FALSE(storage_->Remove("a")->HasError());
|
| - settings.Remove("a", NULL);
|
| + settings.Remove("a", nullptr);
|
| EXPECT_FALSE(storage_->Set(DEFAULTS, "b", *byte_value_1_)->HasError());
|
| settings.Set("b", byte_value_1_->DeepCopy());
|
| EXPECT_TRUE(SettingsEqual(settings));
|
| @@ -395,8 +393,8 @@ TEST_F(ExtensionSettingsQuotaTest, WithInitialDataAndByteQuota) {
|
| to_remove.push_back("a");
|
| to_remove.push_back("b");
|
| storage_->Remove(to_remove);
|
| - settings.Remove("a", NULL);
|
| - settings.Remove("b", NULL);
|
| + settings.Remove("a", nullptr);
|
| + settings.Remove("b", nullptr);
|
| EXPECT_TRUE(SettingsEqual(settings));
|
|
|
| EXPECT_FALSE(storage_->Set(DEFAULTS, "d", *byte_value_256_)->HasError());
|
| @@ -458,9 +456,9 @@ TEST_F(ExtensionSettingsQuotaTest, InitiallyOverMaxKeys) {
|
|
|
| // Should be able after removing 2.
|
| storage_->Remove("a");
|
| - settings.Remove("a", NULL);
|
| + settings.Remove("a", nullptr);
|
| storage_->Remove("b");
|
| - settings.Remove("b", NULL);
|
| + settings.Remove("b", nullptr);
|
| EXPECT_TRUE(SettingsEqual(settings));
|
|
|
| EXPECT_FALSE(storage_->Set(DEFAULTS, "e", *byte_value_1_)->HasError());
|
|
|