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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/host_content_settings_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/cookie_settings_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store.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/host_content_settings_map_unittest.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index f2c60c4f9ed415b462c7221950da06f418a2272e..19758f057c1dcd383019d1f2c23cddd6821de9a4 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -19,6 +19,7 @@
#include "chrome/test/base/testing_pref_service_syncable.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"
+#include "extensions/common/constants.h"
#include "net/base/static_cookie_policy.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -78,7 +79,8 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) {
// Check returning individual settings.
GURL host("http://example.com/");
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
EXPECT_EQ(CONTENT_SETTING_ALLOW,
host_content_settings_map->GetContentSetting(
host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
@@ -151,7 +153,8 @@ TEST_F(HostContentSettingsMapTest, IndividualSettings) {
// Check returning all hosts for a setting.
ContentSettingsPattern pattern2 =
- ContentSettingsPattern::FromString("[*.]example.org");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.org");
host_content_settings_map->SetContentSetting(
pattern2,
ContentSettingsPattern::Wildcard(),
@@ -186,9 +189,11 @@ TEST_F(HostContentSettingsMapTest, Clear) {
// Check clearing one type.
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.org");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.org");
ContentSettingsPattern pattern2 =
- ContentSettingsPattern::FromString("[*.]example.net");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.net");
host_content_settings_map->SetContentSetting(
pattern2,
ContentSettingsPattern::Wildcard(),
@@ -235,9 +240,11 @@ TEST_F(HostContentSettingsMapTest, Patterns) {
GURL host2("http://www.example.com/");
GURL host3("http://example.org/");
ContentSettingsPattern pattern1 =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
ContentSettingsPattern pattern2 =
- ContentSettingsPattern::FromString("example.org");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "example.org");
EXPECT_EQ(CONTENT_SETTING_ALLOW,
host_content_settings_map->GetContentSetting(
host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
@@ -274,7 +281,8 @@ TEST_F(HostContentSettingsMapTest, Observer) {
MockSettingsObserver observer;
ContentSettingsPattern primary_pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
ContentSettingsPattern secondary_pattern =
ContentSettingsPattern::Wildcard();
EXPECT_CALL(observer,
@@ -356,7 +364,8 @@ TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) {
prefs::kContentSettingsPatternPairs)->GetValue()->DeepCopy());
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
GURL host("http://example.com");
EXPECT_EQ(CONTENT_SETTING_ALLOW,
@@ -398,7 +407,8 @@ TEST_F(HostContentSettingsMapTest, HostTrimEndingDotCheck) {
CookieSettings::Factory::GetForProfile(&profile).get();
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
GURL host_ending_with_dot("http://example.com./");
EXPECT_EQ(CONTENT_SETTING_ALLOW,
@@ -552,11 +562,14 @@ TEST_F(HostContentSettingsMapTest, NestedSettings) {
GURL host("http://a.b.example.com/");
ContentSettingsPattern pattern1 =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
ContentSettingsPattern pattern2 =
- ContentSettingsPattern::FromString("[*.]b.example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]b.example.com");
ContentSettingsPattern pattern3 =
- ContentSettingsPattern::FromString("a.b.example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "a.b.example.com");
host_content_settings_map->SetContentSetting(
pattern1,
@@ -621,7 +634,8 @@ TEST_F(HostContentSettingsMapTest, OffTheRecord) {
GURL host("http://example.com/");
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
EXPECT_EQ(CONTENT_SETTING_ALLOW,
host_content_settings_map->GetContentSetting(
@@ -763,7 +777,8 @@ TEST_F(HostContentSettingsMapTest,
// Set pattern for JavaScript setting.
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
host_content_settings_map->SetContentSetting(
pattern,
ContentSettingsPattern::Wildcard(),
@@ -803,7 +818,8 @@ TEST_F(HostContentSettingsMapTest,
// Set an exception to allow "[*.]example.com"
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
host_content_settings_map->SetContentSetting(
pattern,
@@ -898,7 +914,8 @@ TEST_F(HostContentSettingsMapTest, GetContentSetting) {
GURL host("http://example.com/");
GURL embedder("chrome://foo");
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
host_content_settings_map->SetContentSetting(
pattern,
ContentSettingsPattern::Wildcard(),
« no previous file with comments | « chrome/browser/content_settings/cookie_settings_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store.cc » ('j') | chrome/common/content_settings_pattern.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698