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

Side by Side Diff: chrome/browser/content_settings/content_settings_supervised_provider_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) 2015 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2015 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 "chrome/browser/content_settings/content_settings_supervised_provider.h " 5 #include "chrome/browser/content_settings/content_settings_supervised_provider.h "
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 TEST_F(SupervisedUserProviderTest, GeolocationTest) { 52 TEST_F(SupervisedUserProviderTest, GeolocationTest) {
53 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator( 53 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator(
54 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false); 54 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false);
55 EXPECT_FALSE(rule_iterator); 55 EXPECT_FALSE(rule_iterator);
56 56
57 // Disable the default geolocation setting. 57 // Disable the default geolocation setting.
58 EXPECT_CALL(mock_observer_, 58 EXPECT_CALL(mock_observer_,
59 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, 59 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_GEOLOCATION,
60 std::string())); 60 std::string()));
61 service_.SetLocalSetting(supervised_users::kGeolocationDisabled, 61 service_.SetLocalSetting(supervised_users::kGeolocationDisabled,
62 base::MakeUnique<base::FundamentalValue>(true)); 62 base::MakeUnique<base::Value>(true));
63 63
64 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION, 64 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION,
65 std::string(), false); 65 std::string(), false);
66 ASSERT_TRUE(rule_iterator->HasNext()); 66 ASSERT_TRUE(rule_iterator->HasNext());
67 Rule rule = rule_iterator->Next(); 67 Rule rule = rule_iterator->Next();
68 EXPECT_FALSE(rule_iterator->HasNext()); 68 EXPECT_FALSE(rule_iterator->HasNext());
69 69
70 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern); 70 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern);
71 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern); 71 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern);
72 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get())); 72 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get()));
73 73
74 // Re-enable the default geolocation setting. 74 // Re-enable the default geolocation setting.
75 EXPECT_CALL(mock_observer_, 75 EXPECT_CALL(mock_observer_,
76 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, 76 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_GEOLOCATION,
77 std::string())); 77 std::string()));
78 service_.SetLocalSetting(supervised_users::kGeolocationDisabled, 78 service_.SetLocalSetting(supervised_users::kGeolocationDisabled,
79 base::MakeUnique<base::FundamentalValue>(false)); 79 base::MakeUnique<base::Value>(false));
80 80
81 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION, 81 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION,
82 std::string(), false); 82 std::string(), false);
83 EXPECT_FALSE(rule_iterator); 83 EXPECT_FALSE(rule_iterator);
84 } 84 }
85 85
86 TEST_F(SupervisedUserProviderTest, CookiesTest) { 86 TEST_F(SupervisedUserProviderTest, CookiesTest) {
87 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator( 87 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator(
88 CONTENT_SETTINGS_TYPE_COOKIES, std::string(), false); 88 CONTENT_SETTINGS_TYPE_COOKIES, std::string(), false);
89 EXPECT_FALSE(rule_iterator); 89 EXPECT_FALSE(rule_iterator);
90 90
91 // Allow cookies everywhere. 91 // Allow cookies everywhere.
92 EXPECT_CALL(mock_observer_, 92 EXPECT_CALL(mock_observer_,
93 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_COOKIES, 93 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_COOKIES,
94 std::string())); 94 std::string()));
95 service_.SetLocalSetting(supervised_users::kCookiesAlwaysAllowed, 95 service_.SetLocalSetting(supervised_users::kCookiesAlwaysAllowed,
96 base::MakeUnique<base::FundamentalValue>(true)); 96 base::MakeUnique<base::Value>(true));
97 97
98 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, 98 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES,
99 std::string(), false); 99 std::string(), false);
100 ASSERT_TRUE(rule_iterator->HasNext()); 100 ASSERT_TRUE(rule_iterator->HasNext());
101 Rule rule = rule_iterator->Next(); 101 Rule rule = rule_iterator->Next();
102 EXPECT_FALSE(rule_iterator->HasNext()); 102 EXPECT_FALSE(rule_iterator->HasNext());
103 103
104 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern); 104 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern);
105 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern); 105 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern);
106 EXPECT_EQ(CONTENT_SETTING_ALLOW, ValueToContentSetting(rule.value.get())); 106 EXPECT_EQ(CONTENT_SETTING_ALLOW, ValueToContentSetting(rule.value.get()));
107 107
108 // Re-enable the default cookie setting. 108 // Re-enable the default cookie setting.
109 EXPECT_CALL(mock_observer_, 109 EXPECT_CALL(mock_observer_,
110 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_COOKIES, 110 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_COOKIES,
111 std::string())); 111 std::string()));
112 service_.SetLocalSetting(supervised_users::kCookiesAlwaysAllowed, 112 service_.SetLocalSetting(supervised_users::kCookiesAlwaysAllowed,
113 base::MakeUnique<base::FundamentalValue>(false)); 113 base::MakeUnique<base::Value>(false));
114 114
115 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES, 115 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_COOKIES,
116 std::string(), false); 116 std::string(), false);
117 EXPECT_FALSE(rule_iterator); 117 EXPECT_FALSE(rule_iterator);
118 } 118 }
119 119
120 TEST_F(SupervisedUserProviderTest, CameraMicTest) { 120 TEST_F(SupervisedUserProviderTest, CameraMicTest) {
121 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator( 121 std::unique_ptr<RuleIterator> rule_iterator = provider_->GetRuleIterator(
122 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false); 122 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false);
123 EXPECT_FALSE(rule_iterator); 123 EXPECT_FALSE(rule_iterator);
124 rule_iterator = provider_->GetRuleIterator( 124 rule_iterator = provider_->GetRuleIterator(
125 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false); 125 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false);
126 EXPECT_FALSE(rule_iterator); 126 EXPECT_FALSE(rule_iterator);
127 127
128 // Disable the default camera and microphone setting. 128 // Disable the default camera and microphone setting.
129 EXPECT_CALL( 129 EXPECT_CALL(
130 mock_observer_, 130 mock_observer_,
131 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 131 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
132 std::string())); 132 std::string()));
133 EXPECT_CALL(mock_observer_, 133 EXPECT_CALL(mock_observer_,
134 OnContentSettingChanged( 134 OnContentSettingChanged(
135 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 135 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
136 service_.SetLocalSetting(supervised_users::kCameraMicDisabled, 136 service_.SetLocalSetting(supervised_users::kCameraMicDisabled,
137 base::MakeUnique<base::FundamentalValue>(true)); 137 base::MakeUnique<base::Value>(true));
138 138
139 rule_iterator = provider_->GetRuleIterator( 139 rule_iterator = provider_->GetRuleIterator(
140 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false); 140 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false);
141 ASSERT_TRUE(rule_iterator->HasNext()); 141 ASSERT_TRUE(rule_iterator->HasNext());
142 Rule rule = rule_iterator->Next(); 142 Rule rule = rule_iterator->Next();
143 EXPECT_FALSE(rule_iterator->HasNext()); 143 EXPECT_FALSE(rule_iterator->HasNext());
144 144
145 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern); 145 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern);
146 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern); 146 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern);
147 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get())); 147 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get()));
(...skipping 10 matching lines...) Expand all
158 158
159 // Re-enable the default camera and microphone setting. 159 // Re-enable the default camera and microphone setting.
160 EXPECT_CALL( 160 EXPECT_CALL(
161 mock_observer_, 161 mock_observer_,
162 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 162 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
163 std::string())); 163 std::string()));
164 EXPECT_CALL(mock_observer_, 164 EXPECT_CALL(mock_observer_,
165 OnContentSettingChanged( 165 OnContentSettingChanged(
166 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string())); 166 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string()));
167 service_.SetLocalSetting(supervised_users::kCameraMicDisabled, 167 service_.SetLocalSetting(supervised_users::kCameraMicDisabled,
168 base::MakeUnique<base::FundamentalValue>(false)); 168 base::MakeUnique<base::Value>(false));
169 169
170 rule_iterator = provider_->GetRuleIterator( 170 rule_iterator = provider_->GetRuleIterator(
171 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false); 171 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false);
172 EXPECT_FALSE(rule_iterator); 172 EXPECT_FALSE(rule_iterator);
173 173
174 rule_iterator = provider_->GetRuleIterator( 174 rule_iterator = provider_->GetRuleIterator(
175 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false); 175 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false);
176 EXPECT_FALSE(rule_iterator); 176 EXPECT_FALSE(rule_iterator);
177 } 177 }
178 178
179 } // namespace content_settings 179 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698