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

Side by Side Diff: chrome/browser/content_settings/content_settings_supervised_provider_unittest.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month 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 "chrome/browser/content_settings/content_settings_mock_observer.h" 10 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 std::unique_ptr<RuleIterator> rule_iterator(provider_->GetRuleIterator( 52 std::unique_ptr<RuleIterator> rule_iterator(provider_->GetRuleIterator(
53 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false)); 53 CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false));
54 EXPECT_FALSE(rule_iterator->HasNext()); 54 EXPECT_FALSE(rule_iterator->HasNext());
55 rule_iterator.reset(); 55 rule_iterator.reset();
56 56
57 // Disable the default geolocation setting. 57 // Disable the default geolocation setting.
58 EXPECT_CALL(mock_observer_, OnContentSettingChanged( 58 EXPECT_CALL(mock_observer_, OnContentSettingChanged(
59 _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, "")); 59 _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
60 service_.SetLocalSetting( 60 service_.SetLocalSetting(
61 supervised_users::kGeolocationDisabled, 61 supervised_users::kGeolocationDisabled,
62 std::unique_ptr<base::Value>(new base::FundamentalValue(true))); 62 std::unique_ptr<base::Value>(new 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 rule_iterator.reset(); 73 rule_iterator.reset();
74 74
75 // Re-enable the default geolocation setting. 75 // Re-enable the default geolocation setting.
76 EXPECT_CALL(mock_observer_, OnContentSettingChanged( 76 EXPECT_CALL(mock_observer_, OnContentSettingChanged(
77 _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, "")); 77 _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
78 service_.SetLocalSetting( 78 service_.SetLocalSetting(
79 supervised_users::kGeolocationDisabled, 79 supervised_users::kGeolocationDisabled,
80 std::unique_ptr<base::Value>(new base::FundamentalValue(false))); 80 std::unique_ptr<base::Value>(new base::Value(false)));
81 81
82 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION, 82 rule_iterator = provider_->GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION,
83 std::string(), false); 83 std::string(), false);
84 EXPECT_FALSE(rule_iterator->HasNext()); 84 EXPECT_FALSE(rule_iterator->HasNext());
85 } 85 }
86 86
87 TEST_F(SupervisedUserProviderTest, CameraMicTest) { 87 TEST_F(SupervisedUserProviderTest, CameraMicTest) {
88 std::unique_ptr<RuleIterator> rule_iterator(provider_->GetRuleIterator( 88 std::unique_ptr<RuleIterator> rule_iterator(provider_->GetRuleIterator(
89 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false)); 89 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false));
90 EXPECT_FALSE(rule_iterator->HasNext()); 90 EXPECT_FALSE(rule_iterator->HasNext());
91 rule_iterator.reset(); 91 rule_iterator.reset();
92 rule_iterator = provider_->GetRuleIterator( 92 rule_iterator = provider_->GetRuleIterator(
93 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false); 93 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false);
94 EXPECT_FALSE(rule_iterator->HasNext()); 94 EXPECT_FALSE(rule_iterator->HasNext());
95 rule_iterator.reset(); 95 rule_iterator.reset();
96 96
97 // Disable the default camera and microphone setting. 97 // Disable the default camera and microphone setting.
98 EXPECT_CALL(mock_observer_, 98 EXPECT_CALL(mock_observer_,
99 OnContentSettingChanged( 99 OnContentSettingChanged(
100 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "")); 100 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, ""));
101 EXPECT_CALL( 101 EXPECT_CALL(
102 mock_observer_, 102 mock_observer_,
103 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "")); 103 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, ""));
104 service_.SetLocalSetting( 104 service_.SetLocalSetting(
105 supervised_users::kCameraMicDisabled, 105 supervised_users::kCameraMicDisabled,
106 std::unique_ptr<base::Value>(new base::FundamentalValue(true))); 106 std::unique_ptr<base::Value>(new base::Value(true)));
107 107
108 rule_iterator = provider_->GetRuleIterator( 108 rule_iterator = provider_->GetRuleIterator(
109 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false); 109 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false);
110 ASSERT_TRUE(rule_iterator->HasNext()); 110 ASSERT_TRUE(rule_iterator->HasNext());
111 Rule rule = rule_iterator->Next(); 111 Rule rule = rule_iterator->Next();
112 EXPECT_FALSE(rule_iterator->HasNext()); 112 EXPECT_FALSE(rule_iterator->HasNext());
113 113
114 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern); 114 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.primary_pattern);
115 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern); 115 EXPECT_EQ(ContentSettingsPattern::Wildcard(), rule.secondary_pattern);
116 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get())); 116 EXPECT_EQ(CONTENT_SETTING_BLOCK, ValueToContentSetting(rule.value.get()));
(...skipping 12 matching lines...) Expand all
129 129
130 // Re-enable the default camera and microphone setting. 130 // Re-enable the default camera and microphone setting.
131 EXPECT_CALL(mock_observer_, 131 EXPECT_CALL(mock_observer_,
132 OnContentSettingChanged( 132 OnContentSettingChanged(
133 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "")); 133 _, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, ""));
134 EXPECT_CALL( 134 EXPECT_CALL(
135 mock_observer_, 135 mock_observer_,
136 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "")); 136 OnContentSettingChanged(_, _, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, ""));
137 service_.SetLocalSetting( 137 service_.SetLocalSetting(
138 supervised_users::kCameraMicDisabled, 138 supervised_users::kCameraMicDisabled,
139 std::unique_ptr<base::Value>(new base::FundamentalValue(false))); 139 std::unique_ptr<base::Value>(new base::Value(false)));
140 140
141 rule_iterator = provider_->GetRuleIterator( 141 rule_iterator = provider_->GetRuleIterator(
142 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false); 142 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), false);
143 EXPECT_FALSE(rule_iterator->HasNext()); 143 EXPECT_FALSE(rule_iterator->HasNext());
144 rule_iterator.reset(); 144 rule_iterator.reset();
145 rule_iterator = provider_->GetRuleIterator( 145 rule_iterator = provider_->GetRuleIterator(
146 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false); 146 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), false);
147 EXPECT_FALSE(rule_iterator->HasNext()); 147 EXPECT_FALSE(rule_iterator->HasNext());
148 } 148 }
149 149
150 } // namespace content_settings 150 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698