chrome/browser/content_settings/content_settings_origin_identifier_value_map_unittest.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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: 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

« chrome/browser/content_settings/content_settings_details.h ('K') | « chrome/browser/content_settings/content_settings_details.h ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..667ad20819c90d813674f9c5f30090a70eb4d05a 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 "chrome/common/chrome_content_settings_client.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "url/gurl.h"

@@ -19,8 +20,9 @@ TEST(OriginIdentifierValueMapTest, SetGetValue) {

GURL("http://www.google.com"),

CONTENT_SETTINGS_TYPE_COOKIES,

std::string()));

- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),

- ContentSettingsPattern::FromString("[*.]google.com"),

+ content_settings::ChromeContentSettingsClient client;

+ map.SetValue(ContentSettingsPattern::FromString(&client, "[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_COOKIES,

std::string(),

new base::FundamentalValue(1));

@@ -64,8 +66,9 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {

"java-plugin"));

// Set sample values.

- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),

- ContentSettingsPattern::FromString("[*.]google.com"),

+ content_settings::ChromeContentSettingsClient client;

+ map.SetValue(ContentSettingsPattern::FromString(&client, "[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_PLUGINS,

"java-plugin",

new base::FundamentalValue(1));

@@ -82,8 +85,8 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {

"flash-plugin"));

// Delete non-existing value.

map.DeleteValue(

- ContentSettingsPattern::FromString("[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_PLUGINS,

"flash-plugin");

EXPECT_EQ(NULL, map.GetValue(GURL("http://www.google.com"),

@@ -98,8 +101,8 @@ TEST(OriginIdentifierValueMapTest, SetDeleteValue) {

// Delete existing value.

map.DeleteValue(

- ContentSettingsPattern::FromString("[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_PLUGINS,

"java-plugin");

@@ -114,13 +117,14 @@ TEST(OriginIdentifierValueMapTest, Clear) {

EXPECT_TRUE(map.empty());

// Set two values.

- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),

- ContentSettingsPattern::FromString("[*.]google.com"),

+ content_settings::ChromeContentSettingsClient client;

+ map.SetValue(ContentSettingsPattern::FromString(&client, "[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]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(&client, "[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_COOKIES,

std::string(),

new base::FundamentalValue(1));

@@ -144,14 +148,15 @@ TEST(OriginIdentifierValueMapTest, Clear) {

TEST(OriginIdentifierValueMapTest, ListEntryPrecedences) {

content_settings::OriginIdentifierValueMap map;

- map.SetValue(ContentSettingsPattern::FromString("[*.]google.com"),

- ContentSettingsPattern::FromString("[*.]google.com"),

+ content_settings::ChromeContentSettingsClient client;

+ map.SetValue(ContentSettingsPattern::FromString(&client, "[*.]google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]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(&client, "www.google.com"),

+ ContentSettingsPattern::FromString(&client, "[*.]google.com"),

CONTENT_SETTINGS_TYPE_COOKIES,

std::string(),

new base::FundamentalValue(2));

@@ -180,10 +185,11 @@ TEST(OriginIdentifierValueMapTest, IterateEmpty) {

TEST(OriginIdentifierValueMapTest, IterateNonempty) {

// Verify the precedence order.

content_settings::OriginIdentifierValueMap map;

+ content_settings::ChromeContentSettingsClient client;

ContentSettingsPattern pattern =

- ContentSettingsPattern::FromString("[*.]google.com");

+ ContentSettingsPattern::FromString(&client, "[*.]google.com");

ContentSettingsPattern sub_pattern =

- ContentSettingsPattern::FromString("sub.google.com");

+ ContentSettingsPattern::FromString(&client, "sub.google.com");

map.SetValue(pattern,

ContentSettingsPattern::Wildcard(),

CONTENT_SETTINGS_TYPE_COOKIES,