summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/declarative')
-rw-r--r--chrome/browser/extensions/api/declarative/initializing_rules_registry.cc6
-rw-r--r--chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc6
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/declarative/initializing_rules_registry.cc b/chrome/browser/extensions/api/declarative/initializing_rules_registry.cc
index 0074233..d209bed 100644
--- a/chrome/browser/extensions/api/declarative/initializing_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative/initializing_rules_registry.cc
@@ -39,7 +39,7 @@ std::string InitializingRulesRegistry::RemoveRules(
if (!error.empty())
return error;
RemoveUsedRuleIdentifiers(extension_id, rule_identifiers);
- return "";
+ return std::string();
}
std::string InitializingRulesRegistry::RemoveAllRules(
@@ -48,7 +48,7 @@ std::string InitializingRulesRegistry::RemoveAllRules(
if (!error.empty())
return error;
RemoveAllUsedRuleIdentifiers(extension_id);
- return "";
+ return std::string();
}
std::string InitializingRulesRegistry::GetRules(
@@ -122,7 +122,7 @@ std::string InitializingRulesRegistry::CheckAndFillInOptionalRules(
used_rule_identifiers_[extension_id].insert(*(rule->id));
}
}
- return "";
+ return std::string();
}
void InitializingRulesRegistry::FillInOptionalPriorities(
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
index 4f49f36..1be1983 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
@@ -69,7 +69,7 @@ TEST_F(RulesRegistryWithCacheTest, AddRules) {
registry_->SetResult("Error");
EXPECT_EQ("Error", AddRule(extension_id, rule_id));
EXPECT_EQ(0, GetNumberOfRules(extension_id));
- registry_->SetResult("");
+ registry_->SetResult(std::string());
// Check that rules can be inserted.
EXPECT_EQ("", AddRule(extension_id, rule_id));
@@ -97,7 +97,7 @@ TEST_F(RulesRegistryWithCacheTest, RemoveRules) {
registry_->SetResult("Error");
EXPECT_EQ("Error", RemoveRule(extension_id, rule_id));
EXPECT_EQ(1, GetNumberOfRules(extension_id));
- registry_->SetResult("");
+ registry_->SetResult(std::string());
// Check that nothing happens if a rule does not exist.
EXPECT_EQ("", RemoveRule(extension_id, "unknown_rule"));
@@ -122,7 +122,7 @@ TEST_F(RulesRegistryWithCacheTest, RemoveAllRules) {
registry_->SetResult("Error");
EXPECT_EQ("Error", registry_->RemoveAllRules(extension_id));
EXPECT_EQ(2, GetNumberOfRules(extension_id));
- registry_->SetResult("");
+ registry_->SetResult(std::string());
// Check that rules may be removed and only for the correct extension.
EXPECT_EQ("", registry_->RemoveAllRules(extension_id));