Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2775)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/content_settings/content_settings_internal_extension_provider.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
index 21089fb9de0caac4b2def83e044892501ab9739a..b8612a58acaf2dffcfae847a6f2ce18b2b8b00d6 100644
--- a/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc
@@ -14,38 +14,40 @@
TEST(OriginIdentifierValueMapTest, SetGetValue) {
content_settings::OriginIdentifierValueMap map;
- EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
- GURL("http://www.google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- ""));
- map.SetValue(
- ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(1));
+ EXPECT_EQ(NULL,
+ map.GetValue(GURL("http://www.google.com"),
+ GURL("http://www.google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string()));
+ map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
+ ContentSettingsPattern::FromString("[*.]google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(1));
scoped_ptr<Value> expected_value(Value::CreateIntegerValue(1));
- EXPECT_TRUE(expected_value->Equals(
- map.GetValue(GURL("http://www.google.com"),
- GURL("http://www.google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "")));
-
- EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
- GURL("http://www.youtube.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- ""));
-
- EXPECT_EQ(NULL, map.GetValue(GURL("http://www.youtube.com"),
- GURL("http://www.google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- ""));
-
- EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
- GURL("http://www.google.com"),
- CONTENT_SETTINGS_TYPE_POPUPS,
- ""));
+ EXPECT_TRUE(expected_value->Equals(map.GetValue(GURL("http://www.google.com"),
+ GURL("http://www.google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string())));
+
+ EXPECT_EQ(NULL,
+ map.GetValue(GURL("http://www.google.com"),
+ GURL("http://www.youtube.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string()));
+
+ EXPECT_EQ(NULL,
+ map.GetValue(GURL("http://www.youtube.com"),
+ GURL("http://www.google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string()));
+
+ EXPECT_EQ(NULL,
+ map.GetValue(GURL("http://www.google.com"),
+ GURL("http://www.google.com"),
+ CONTENT_SETTINGS_TYPE_POPUPS,
+ std::string()));
EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
GURL("http://www.google.com"),
@@ -119,12 +121,11 @@ TEST(OriginIdentifierValueMapTest, Clear) {
CONTENT_SETTINGS_TYPE_PLUGINS,
"java-plugin",
Value::CreateIntegerValue(1));
- map.SetValue(
- ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(1));
+ map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
+ ContentSettingsPattern::FromString("[*.]google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(1));
EXPECT_FALSE(map.empty());
int actual_value;
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"),
@@ -145,38 +146,36 @@ TEST(OriginIdentifierValueMapTest, Clear) {
TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {
content_settings::OriginIdentifierValueMap map;
- map.SetValue(
- ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(1));
+ map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
+ ContentSettingsPattern::FromString("[*.]google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(1));
- map.SetValue(
- ContentSettingsPattern::FromString("www.google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(2));
+ map.SetValue(ContentSettingsPattern::FromString("www.google.com"),
+ ContentSettingsPattern::FromString("[*.]google.com"),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(2));
int actual_value;
EXPECT_TRUE(map.GetValue(GURL("http://mail.google.com"),
GURL("http://www.google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
- "")->GetAsInteger(&actual_value));
+ std::string())->GetAsInteger(&actual_value));
EXPECT_EQ(1, actual_value);
EXPECT_TRUE(map.GetValue(GURL("http://www.google.com"),
GURL("http://www.google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
- "")->GetAsInteger(&actual_value));
+ std::string())->GetAsInteger(&actual_value));
EXPECT_EQ(2, actual_value);
}
TEST(OriginIdentifierValueMapTest, IterateEmpty) {
content_settings::OriginIdentifierValueMap map;
scoped_ptr<content_settings::RuleIterator> rule_iterator(
- map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, "", NULL));
+ map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, std::string(), NULL));
EXPECT_FALSE(rule_iterator->HasNext());
}
@@ -187,21 +186,19 @@ TEST(OriginIdentifierValueMapTest, IterateNonempty) {
ContentSettingsPattern::FromString("[*.]google.com");
ContentSettingsPattern sub_pattern =
ContentSettingsPattern::FromString("sub.google.com");
- map.SetValue(
- pattern,
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(1));
- map.SetValue(
- sub_pattern,
- ContentSettingsPattern::Wildcard(),
- CONTENT_SETTINGS_TYPE_COOKIES,
- "",
- Value::CreateIntegerValue(2));
+ map.SetValue(pattern,
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(1));
+ map.SetValue(sub_pattern,
+ ContentSettingsPattern::Wildcard(),
+ CONTENT_SETTINGS_TYPE_COOKIES,
+ std::string(),
+ Value::CreateIntegerValue(2));
scoped_ptr<content_settings::RuleIterator> rule_iterator(
- map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, "", NULL));
+ map.GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, std::string(), NULL));
ASSERT_TRUE(rule_iterator->HasNext());
content_settings::Rule rule = rule_iterator->Next();
EXPECT_EQ(sub_pattern, rule.primary_pattern);
« no previous file with comments | « chrome/browser/content_settings/content_settings_internal_extension_provider.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698