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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed the clients Created 6 years, 4 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_details.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/common/content_settings_pattern.h » ('J')
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 5806050dd034376717cb970628a9cf58835011e1..eb94b12a6768de572c2806f7ba6a48a44d9478e3 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
@@ -8,6 +8,7 @@
#include "base/values.h"
#include "chrome/browser/content_settings/content_settings_rule.h"
#include "chrome/browser/content_settings/content_settings_utils.h"
+#include "extensions/common/constants.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -19,8 +20,10 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) {
GURL("http://www.google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
std::string()));
- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
std::string(),
new base::FundamentalValue(1));
@@ -64,8 +67,10 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
"java-plugin"));
// Set sample values.
- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_PLUGINS,
"java-plugin",
new base::FundamentalValue(1));
@@ -82,8 +87,10 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
"flash-plugin"));
// Delete non-existing value.
map.DeleteValue(
- ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_PLUGINS,
"flash-plugin");
EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),
@@ -98,8 +105,10 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {
// Delete existing value.
map.DeleteValue(
- ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_PLUGINS,
"java-plugin");
@@ -114,13 +123,17 @@ TEST(OriginIdentifierValueMapTest, Clear) {
EXPECT_TRUE(map.empty());
// Set two values.
- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_PLUGINS,
"java-plugin",
new base::FundamentalValue(1));
- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
std::string(),
new base::FundamentalValue(1));
@@ -144,14 +157,18 @@ TEST(OriginIdentifierValueMapTest, Clear) {
TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {
content_settings::OriginIdentifierValueMap map;
- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
std::string(),
new base::FundamentalValue(1));
- map.SetValue(ContentSettingsPattern::FromString("www.google.com"),
- ContentSettingsPattern::FromString("[*.]google.com"),
+ map.SetValue(ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "www.google.com"),
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com"),
CONTENT_SETTINGS_TYPE_COOKIES,
std::string(),
new base::FundamentalValue(2));
@@ -181,9 +198,11 @@ TEST(OriginIdentifierValueMapTest, IterateNonempty) {
// Verify the precedence order.
content_settings::OriginIdentifierValueMap map;
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]google.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]google.com");
ContentSettingsPattern sub_pattern =
- ContentSettingsPattern::FromString("sub.google.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "sub.google.com");
map.SetValue(pattern,
ContentSettingsPattern::Wildcard(),
CONTENT_SETTINGS_TYPE_COOKIES,
« no previous file with comments | « chrome/browser/content_settings/content_settings_details.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/common/content_settings_pattern.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698