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

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider_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
Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 9ad8bfbe544b220ec2b028455a1fb93670b569d7..82833fb86fdf7d4e1fed77c81b90a8f6d7aa66ea 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -29,6 +29,7 @@
#include "chrome/test/base/testing_profile.h"
#include "components/pref_registry/pref_registry_syncable.h"
#include "content/public/test/test_browser_thread.h"
+#include "extensions/common/constants.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
@@ -108,7 +109,8 @@ TEST_F(PrefProviderTest, Observer) {
PrefProvider pref_content_settings_provider(profile.GetPrefs(), false);
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
content_settings::MockObserver mock_observer;
EXPECT_CALL(mock_observer,
OnContentSettingChanged(pattern,
@@ -166,7 +168,8 @@ TEST_F(PrefProviderTest, Incognito) {
PrefProvider pref_content_settings_provider(regular_prefs, false);
PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
pref_content_settings_provider.SetWebsiteSetting(
pattern,
pattern,
@@ -205,7 +208,8 @@ TEST_F(PrefProviderTest, GetContentSettingsValue) {
GURL primary_url("http://example.com/");
ContentSettingsPattern primary_pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
EXPECT_EQ(CONTENT_SETTING_DEFAULT,
GetContentSetting(&provider,
@@ -271,11 +275,14 @@ TEST_F(PrefProviderTest, Patterns) {
GURL host3("http://example.org/");
GURL host4("file:///tmp/test.html");
ContentSettingsPattern pattern1 =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
ContentSettingsPattern pattern2 =
- ContentSettingsPattern::FromString("example.org");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "example.org");
ContentSettingsPattern pattern3 =
- ContentSettingsPattern::FromString("file:///tmp/test.html");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "file:///tmp/test.html");
EXPECT_EQ(CONTENT_SETTING_DEFAULT,
GetContentSetting(&pref_content_settings_provider,
@@ -357,7 +364,8 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {
GURL host("http://example.com/");
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
std::string resource1("someplugin");
std::string resource2("otherplugin");
@@ -454,7 +462,8 @@ TEST_F(PrefProviderTest, LastUsage) {
scoped_ptr<base::Clock>(test_clock));
GURL host("http://example.com/");
ContentSettingsPattern pattern =
- ContentSettingsPattern::FromString("[*.]example.com");
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "[*.]example.com");
base::Time no_usage = pref_content_settings_provider.GetLastUsage(
pattern, pattern, CONTENT_SETTINGS_TYPE_GEOLOCATION);

Powered by Google App Engine
This is Rietveld 408576698