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

Unified Diff: chrome/browser/content_settings/content_settings_rule_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_rule_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_rule_unittest.cc b/chrome/browser/content_settings/content_settings_rule_unittest.cc
index 0ec57b17128d165b729415c266cbf530f9382318..91d64b1c61cdcbae4f71ed90d0875cec57ece977 100644
--- a/chrome/browser/content_settings/content_settings_rule_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_rule_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/content_settings/content_settings_rule.h"
+
#include <list>
#include "chrome/common/content_settings_pattern.h"
-#include "chrome/browser/content_settings/content_settings_rule.h"
+#include "extensions/common/constants.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content_settings {
@@ -40,19 +42,23 @@ class ListIterator : public RuleIterator {
TEST(RuleTest, ConcatenationIterator) {
std::list<Rule> rules1;
- rules1.push_back(Rule(ContentSettingsPattern::FromString("a"),
- ContentSettingsPattern::Wildcard(),
- new base::FundamentalValue(0)));
- rules1.push_back(Rule(ContentSettingsPattern::FromString("b"),
- ContentSettingsPattern::Wildcard(),
- new base::FundamentalValue(0)));
+ rules1.push_back(Rule(
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme, "a"),
+ ContentSettingsPattern::Wildcard(),
+ new base::FundamentalValue(0)));
+ rules1.push_back(Rule(
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme, "b"),
+ ContentSettingsPattern::Wildcard(),
+ new base::FundamentalValue(0)));
std::list<Rule> rules2;
- rules2.push_back(Rule(ContentSettingsPattern::FromString("c"),
- ContentSettingsPattern::Wildcard(),
- new base::FundamentalValue(0)));
- rules2.push_back(Rule(ContentSettingsPattern::FromString("d"),
- ContentSettingsPattern::Wildcard(),
- new base::FundamentalValue(0)));
+ rules2.push_back(Rule(
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme, "c"),
+ ContentSettingsPattern::Wildcard(),
+ new base::FundamentalValue(0)));
+ rules2.push_back(Rule(
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme, "d"),
+ ContentSettingsPattern::Wildcard(),
+ new base::FundamentalValue(0)));
ScopedVector<RuleIterator> iterators;
iterators.push_back(new ListIterator(rules1));
@@ -62,19 +68,27 @@ TEST(RuleTest, ConcatenationIterator) {
Rule rule;
ASSERT_TRUE(concatenation_iterator.HasNext());
rule = concatenation_iterator.Next();
- EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("a"));
+ EXPECT_EQ(rule.primary_pattern,
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "a"));
ASSERT_TRUE(concatenation_iterator.HasNext());
rule = concatenation_iterator.Next();
- EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("b"));
+ EXPECT_EQ(rule.primary_pattern,
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "b"));
ASSERT_TRUE(concatenation_iterator.HasNext());
rule = concatenation_iterator.Next();
- EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("c"));
+ EXPECT_EQ(rule.primary_pattern,
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "c"));
ASSERT_TRUE(concatenation_iterator.HasNext());
rule = concatenation_iterator.Next();
- EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("d"));
+ EXPECT_EQ(rule.primary_pattern,
+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,
+ "d"));
EXPECT_FALSE(concatenation_iterator.HasNext());
}

Powered by Google App Engine
This is Rietveld 408576698