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

Side by Side Diff: components/content_settings/core/browser/content_settings_rule_unittest.cc

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <list> 5 #include <list>
6 #include <utility> 6 #include <utility>
7 #include <vector> 7 #include <vector>
8 8
9 #include "components/content_settings/core/browser/content_settings_rule.h" 9 #include "components/content_settings/core/browser/content_settings_rule.h"
10 #include "components/content_settings/core/common/content_settings_pattern.h" 10 #include "components/content_settings/core/common/content_settings_pattern.h"
(...skipping 24 matching lines...) Expand all
35 private: 35 private:
36 std::list<Rule> rules_; 36 std::list<Rule> rules_;
37 }; 37 };
38 38
39 } // namespace 39 } // namespace
40 40
41 TEST(RuleTest, ConcatenationIterator) { 41 TEST(RuleTest, ConcatenationIterator) {
42 std::list<Rule> rules1; 42 std::list<Rule> rules1;
43 rules1.push_back(Rule(ContentSettingsPattern::FromString("a"), 43 rules1.push_back(Rule(ContentSettingsPattern::FromString("a"),
44 ContentSettingsPattern::Wildcard(), 44 ContentSettingsPattern::Wildcard(),
45 new base::FundamentalValue(0))); 45 new base::Value(0)));
46 rules1.push_back(Rule(ContentSettingsPattern::FromString("b"), 46 rules1.push_back(Rule(ContentSettingsPattern::FromString("b"),
47 ContentSettingsPattern::Wildcard(), 47 ContentSettingsPattern::Wildcard(),
48 new base::FundamentalValue(0))); 48 new base::Value(0)));
49 std::list<Rule> rules2; 49 std::list<Rule> rules2;
50 rules2.push_back(Rule(ContentSettingsPattern::FromString("c"), 50 rules2.push_back(Rule(ContentSettingsPattern::FromString("c"),
51 ContentSettingsPattern::Wildcard(), 51 ContentSettingsPattern::Wildcard(),
52 new base::FundamentalValue(0))); 52 new base::Value(0)));
53 rules2.push_back(Rule(ContentSettingsPattern::FromString("d"), 53 rules2.push_back(Rule(ContentSettingsPattern::FromString("d"),
54 ContentSettingsPattern::Wildcard(), 54 ContentSettingsPattern::Wildcard(),
55 new base::FundamentalValue(0))); 55 new base::Value(0)));
56 56
57 std::vector<std::unique_ptr<RuleIterator>> iterators; 57 std::vector<std::unique_ptr<RuleIterator>> iterators;
58 iterators.push_back(std::unique_ptr<RuleIterator>(new ListIterator(rules1))); 58 iterators.push_back(std::unique_ptr<RuleIterator>(new ListIterator(rules1)));
59 iterators.push_back(std::unique_ptr<RuleIterator>(new ListIterator(rules2))); 59 iterators.push_back(std::unique_ptr<RuleIterator>(new ListIterator(rules2)));
60 ConcatenationIterator concatenation_iterator(std::move(iterators), nullptr); 60 ConcatenationIterator concatenation_iterator(std::move(iterators), nullptr);
61 61
62 Rule rule; 62 Rule rule;
63 ASSERT_TRUE(concatenation_iterator.HasNext()); 63 ASSERT_TRUE(concatenation_iterator.HasNext());
64 rule = concatenation_iterator.Next(); 64 rule = concatenation_iterator.Next();
65 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("a")); 65 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("a"));
66 66
67 ASSERT_TRUE(concatenation_iterator.HasNext()); 67 ASSERT_TRUE(concatenation_iterator.HasNext());
68 rule = concatenation_iterator.Next(); 68 rule = concatenation_iterator.Next();
69 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("b")); 69 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("b"));
70 70
71 ASSERT_TRUE(concatenation_iterator.HasNext()); 71 ASSERT_TRUE(concatenation_iterator.HasNext());
72 rule = concatenation_iterator.Next(); 72 rule = concatenation_iterator.Next();
73 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("c")); 73 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("c"));
74 74
75 ASSERT_TRUE(concatenation_iterator.HasNext()); 75 ASSERT_TRUE(concatenation_iterator.HasNext());
76 rule = concatenation_iterator.Next(); 76 rule = concatenation_iterator.Next();
77 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("d")); 77 EXPECT_EQ(rule.primary_pattern, ContentSettingsPattern::FromString("d"));
78 78
79 EXPECT_FALSE(concatenation_iterator.HasNext()); 79 EXPECT_FALSE(concatenation_iterator.HasNext());
80 } 80 }
81 81
82 } // namespace content_settings 82 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698