OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "app/test/data/resource.h" | 7 #include "app/test/data/resource.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/scoped_ptr.h" | 9 #include "base/scoped_ptr.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
149 } | 149 } |
150 | 150 |
151 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) { | 151 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineOptions) { |
152 CommandLine command_line(CommandLine::NO_PROGRAM); | 152 CommandLine command_line(CommandLine::NO_PROGRAM); |
153 command_line.AppendSwitchASCII(switches::kProxyBypassList, "123"); | 153 command_line.AppendSwitchASCII(switches::kProxyBypassList, "123"); |
154 command_line.AppendSwitchASCII(switches::kProxyServer, "789"); | 154 command_line.AppendSwitchASCII(switches::kProxyServer, "789"); |
155 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( | 155 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( |
156 new policy::MockConfigurationPolicyProvider()); | 156 new policy::MockConfigurationPolicyProvider()); |
157 Value* mode_value = Value::CreateIntegerValue( | 157 Value* mode_value = Value::CreateIntegerValue( |
158 policy::kPolicyManuallyConfiguredProxyMode); | 158 policy::kPolicyManuallyConfiguredProxyMode); |
159 provider->AddPolicy(policy::kPolicyProxyMode, mode_value); | 159 provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value); |
160 provider->AddPolicy(policy::kPolicyProxyBypassList, | 160 provider->AddPolicy(policy::kPolicyProxyBypassList, |
161 Value::CreateStringValue("abc")); | 161 Value::CreateStringValue("abc")); |
162 provider->AddPolicy(policy::kPolicyProxyServer, | 162 provider->AddPolicy(policy::kPolicyProxyServer, |
163 Value::CreateStringValue("ghi")); | 163 Value::CreateStringValue("ghi")); |
164 | 164 |
165 // First verify that command-line options are set correctly when | 165 // First verify that command-line options are set correctly when |
166 // there is no policy in effect. | 166 // there is no policy in effect. |
167 PrefServiceMockBuilder builder; | 167 PrefServiceMockBuilder builder; |
168 builder.WithCommandLine(&command_line); | 168 builder.WithCommandLine(&command_line); |
169 scoped_ptr<PrefService> prefs(builder.Create()); | 169 scoped_ptr<PrefService> prefs(builder.Create()); |
(...skipping 19 matching lines...) Expand all Loading... |
189 } | 189 } |
190 | 190 |
191 TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) { | 191 TEST(PrefServiceTest, ProxyPolicyOverridesUnrelatedCommandLineOptions) { |
192 CommandLine command_line(CommandLine::NO_PROGRAM); | 192 CommandLine command_line(CommandLine::NO_PROGRAM); |
193 command_line.AppendSwitchASCII(switches::kProxyBypassList, "123"); | 193 command_line.AppendSwitchASCII(switches::kProxyBypassList, "123"); |
194 command_line.AppendSwitchASCII(switches::kProxyServer, "789"); | 194 command_line.AppendSwitchASCII(switches::kProxyServer, "789"); |
195 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( | 195 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( |
196 new policy::MockConfigurationPolicyProvider()); | 196 new policy::MockConfigurationPolicyProvider()); |
197 Value* mode_value = Value::CreateIntegerValue( | 197 Value* mode_value = Value::CreateIntegerValue( |
198 policy::kPolicyAutoDetectProxyMode); | 198 policy::kPolicyAutoDetectProxyMode); |
199 provider->AddPolicy(policy::kPolicyProxyMode, mode_value); | 199 provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value); |
200 | 200 |
201 // First verify that command-line options are set correctly when | 201 // First verify that command-line options are set correctly when |
202 // there is no policy in effect. | 202 // there is no policy in effect. |
203 PrefServiceMockBuilder builder; | 203 PrefServiceMockBuilder builder; |
204 builder.WithCommandLine(&command_line); | 204 builder.WithCommandLine(&command_line); |
205 scoped_ptr<PrefService> prefs(builder.Create()); | 205 scoped_ptr<PrefService> prefs(builder.Create()); |
206 browser::RegisterUserPrefs(prefs.get()); | 206 browser::RegisterUserPrefs(prefs.get()); |
207 EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, | 207 EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, |
208 prefs->GetInteger(prefs::kProxyMode)); | 208 prefs->GetInteger(prefs::kProxyMode)); |
209 EXPECT_EQ("789", prefs->GetString(prefs::kProxyServer)); | 209 EXPECT_EQ("789", prefs->GetString(prefs::kProxyServer)); |
(...skipping 14 matching lines...) Expand all Loading... |
224 EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList)); | 224 EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList)); |
225 } | 225 } |
226 | 226 |
227 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) { | 227 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineNoProxy) { |
228 CommandLine command_line(CommandLine::NO_PROGRAM); | 228 CommandLine command_line(CommandLine::NO_PROGRAM); |
229 command_line.AppendSwitch(switches::kNoProxyServer); | 229 command_line.AppendSwitch(switches::kNoProxyServer); |
230 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( | 230 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( |
231 new policy::MockConfigurationPolicyProvider()); | 231 new policy::MockConfigurationPolicyProvider()); |
232 Value* mode_value = Value::CreateIntegerValue( | 232 Value* mode_value = Value::CreateIntegerValue( |
233 policy::kPolicyAutoDetectProxyMode); | 233 policy::kPolicyAutoDetectProxyMode); |
234 provider->AddPolicy(policy::kPolicyProxyMode, mode_value); | 234 provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value); |
235 | 235 |
236 // First verify that command-line options are set correctly when | 236 // First verify that command-line options are set correctly when |
237 // there is no policy in effect. | 237 // there is no policy in effect. |
238 PrefServiceMockBuilder builder; | 238 PrefServiceMockBuilder builder; |
239 builder.WithCommandLine(&command_line); | 239 builder.WithCommandLine(&command_line); |
240 scoped_ptr<PrefService> prefs(builder.Create()); | 240 scoped_ptr<PrefService> prefs(builder.Create()); |
241 browser::RegisterUserPrefs(prefs.get()); | 241 browser::RegisterUserPrefs(prefs.get()); |
242 EXPECT_EQ(ProxyPrefs::MODE_DIRECT, prefs->GetInteger(prefs::kProxyMode)); | 242 EXPECT_EQ(ProxyPrefs::MODE_DIRECT, prefs->GetInteger(prefs::kProxyMode)); |
243 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer)); | 243 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer)); |
244 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl)); | 244 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl)); |
(...skipping 13 matching lines...) Expand all Loading... |
258 EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList)); | 258 EXPECT_EQ(std::string(), prefs2->GetString(prefs::kProxyBypassList)); |
259 } | 259 } |
260 | 260 |
261 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) { | 261 TEST(PrefServiceTest, ProxyPolicyOverridesCommandLineAutoDetect) { |
262 CommandLine command_line(CommandLine::NO_PROGRAM); | 262 CommandLine command_line(CommandLine::NO_PROGRAM); |
263 command_line.AppendSwitch(switches::kProxyAutoDetect); | 263 command_line.AppendSwitch(switches::kProxyAutoDetect); |
264 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( | 264 scoped_ptr<policy::MockConfigurationPolicyProvider> provider( |
265 new policy::MockConfigurationPolicyProvider()); | 265 new policy::MockConfigurationPolicyProvider()); |
266 Value* mode_value = Value::CreateIntegerValue( | 266 Value* mode_value = Value::CreateIntegerValue( |
267 policy::kPolicyNoProxyServerMode); | 267 policy::kPolicyNoProxyServerMode); |
268 provider->AddPolicy(policy::kPolicyProxyMode, mode_value); | 268 provider->AddPolicy(policy::kPolicyProxyServerMode, mode_value); |
269 | 269 |
270 // First verify that the auto-detect is set if there is no managed | 270 // First verify that the auto-detect is set if there is no managed |
271 // PrefStore. | 271 // PrefStore. |
272 PrefServiceMockBuilder builder; | 272 PrefServiceMockBuilder builder; |
273 builder.WithCommandLine(&command_line); | 273 builder.WithCommandLine(&command_line); |
274 scoped_ptr<PrefService> prefs(builder.Create()); | 274 scoped_ptr<PrefService> prefs(builder.Create()); |
275 browser::RegisterUserPrefs(prefs.get()); | 275 browser::RegisterUserPrefs(prefs.get()); |
276 EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, prefs->GetInteger(prefs::kProxyMode)); | 276 EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, prefs->GetInteger(prefs::kProxyMode)); |
277 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer)); | 277 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyServer)); |
278 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl)); | 278 EXPECT_EQ(std::string(), prefs->GetString(prefs::kProxyPacUrl)); |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 Mock::VerifyAndClearExpectations(&observer_); | 377 Mock::VerifyAndClearExpectations(&observer_); |
378 | 378 |
379 EXPECT_CALL(observer_, Observe(_, _, _)).Times(0); | 379 EXPECT_CALL(observer_, Observe(_, _, _)).Times(0); |
380 prefs_.Set(kName, new_value); | 380 prefs_.Set(kName, new_value); |
381 Mock::VerifyAndClearExpectations(&observer_); | 381 Mock::VerifyAndClearExpectations(&observer_); |
382 | 382 |
383 observer_.Expect(&prefs_, kName, null_value_.get()); | 383 observer_.Expect(&prefs_, kName, null_value_.get()); |
384 prefs_.Set(kName, *null_value_); | 384 prefs_.Set(kName, *null_value_); |
385 Mock::VerifyAndClearExpectations(&observer_); | 385 Mock::VerifyAndClearExpectations(&observer_); |
386 } | 386 } |
OLD | NEW |