OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/proxy_config_service_impl.h" | 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 protected: | 338 protected: |
339 virtual void SetUp() { | 339 virtual void SetUp() { |
340 Init(&pref_service_); | 340 Init(&pref_service_); |
341 } | 341 } |
342 | 342 |
343 TestingPrefServiceSimple pref_service_; | 343 TestingPrefServiceSimple pref_service_; |
344 }; | 344 }; |
345 | 345 |
346 TEST_F(ProxyConfigServiceImplTest, NetworkProxy) { | 346 TEST_F(ProxyConfigServiceImplTest, NetworkProxy) { |
347 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { | 347 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { |
348 SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i, | 348 SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "] %s", i, |
349 tests[i].description.c_str())); | 349 tests[i].description.c_str())); |
350 | 350 |
351 ProxyConfigServiceImpl::ProxyConfig test_config; | 351 ProxyConfigServiceImpl::ProxyConfig test_config; |
352 InitConfigWithTestInput(tests[i].input, &test_config); | 352 InitConfigWithTestInput(tests[i].input, &test_config); |
353 config_service_impl_->SetTesting(&test_config); | 353 config_service_impl_->SetTesting(&test_config); |
354 | 354 |
355 net::ProxyConfig config; | 355 net::ProxyConfig config; |
356 EXPECT_EQ(MK_AVAIL(VALID), SyncGetLatestProxyConfig(&config)); | 356 EXPECT_EQ(MK_AVAIL(VALID), SyncGetLatestProxyConfig(&config)); |
357 | 357 |
358 EXPECT_EQ(tests[i].auto_detect, config.auto_detect()); | 358 EXPECT_EQ(tests[i].auto_detect, config.auto_detect()); |
359 EXPECT_EQ(tests[i].pac_url, config.pac_url()); | 359 EXPECT_EQ(tests[i].pac_url, config.pac_url()); |
360 EXPECT_TRUE(tests[i].proxy_rules.Matches(config.proxy_rules())); | 360 EXPECT_TRUE(tests[i].proxy_rules.Matches(config.proxy_rules())); |
361 } | 361 } |
362 } | 362 } |
363 | 363 |
364 TEST_F(ProxyConfigServiceImplTest, ModifyFromUI) { | 364 TEST_F(ProxyConfigServiceImplTest, ModifyFromUI) { |
365 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { | 365 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { |
366 SCOPED_TRACE(StringPrintf("Test[%" PRIuS "] %s", i, | 366 SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "] %s", i, |
367 tests[i].description.c_str())); | 367 tests[i].description.c_str())); |
368 | 368 |
369 // Init with direct. | 369 // Init with direct. |
370 ProxyConfigServiceImpl::ProxyConfig test_config; | 370 ProxyConfigServiceImpl::ProxyConfig test_config; |
371 SetAutomaticProxy(MK_MODE(DIRECT), NULL, &test_config, | 371 SetAutomaticProxy(MK_MODE(DIRECT), NULL, &test_config, |
372 &test_config.automatic_proxy); | 372 &test_config.automatic_proxy); |
373 config_service_impl_->SetTesting(&test_config); | 373 config_service_impl_->SetTesting(&test_config); |
374 | 374 |
375 // Set config to tests[i].input via UI. | 375 // Set config to tests[i].input via UI. |
376 net::ProxyBypassRules bypass_rules; | 376 net::ProxyBypassRules bypass_rules; |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
477 { 6, 7, 8, }, | 477 { 6, 7, 8, }, |
478 { 6, 8, 7, }, | 478 { 6, 8, 7, }, |
479 { 8, 7, 6, }, | 479 { 8, 7, 6, }, |
480 { 7, 6, 8, }, | 480 { 7, 6, 8, }, |
481 }; | 481 }; |
482 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(proxies); ++i) { | 482 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(proxies); ++i) { |
483 const TestParams& managed_params = tests[proxies[i][0]]; | 483 const TestParams& managed_params = tests[proxies[i][0]]; |
484 const TestParams& recommended_params = tests[proxies[i][1]]; | 484 const TestParams& recommended_params = tests[proxies[i][1]]; |
485 const TestParams& network_params = tests[proxies[i][2]]; | 485 const TestParams& network_params = tests[proxies[i][2]]; |
486 | 486 |
487 SCOPED_TRACE(StringPrintf( | 487 SCOPED_TRACE(base::StringPrintf( |
488 "Test[%" PRIuS "] managed=[%s], recommended=[%s], network=[%s]", i, | 488 "Test[%" PRIuS "] managed=[%s], recommended=[%s], network=[%s]", i, |
489 managed_params.description.c_str(), | 489 managed_params.description.c_str(), |
490 recommended_params.description.c_str(), | 490 recommended_params.description.c_str(), |
491 network_params.description.c_str())); | 491 network_params.description.c_str())); |
492 | 492 |
493 ProxyConfigServiceImpl::ProxyConfig managed_config; | 493 ProxyConfigServiceImpl::ProxyConfig managed_config; |
494 InitConfigWithTestInput(managed_params.input, &managed_config); | 494 InitConfigWithTestInput(managed_params.input, &managed_config); |
495 ProxyConfigServiceImpl::ProxyConfig recommended_config; | 495 ProxyConfigServiceImpl::ProxyConfig recommended_config; |
496 InitConfigWithTestInput(recommended_params.input, &recommended_config); | 496 InitConfigWithTestInput(recommended_params.input, &recommended_config); |
497 ProxyConfigServiceImpl::ProxyConfig network_config; | 497 ProxyConfigServiceImpl::ProxyConfig network_config; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
552 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); | 552 EXPECT_EQ(network_params.auto_detect, actual_config.auto_detect()); |
553 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); | 553 EXPECT_EQ(network_params.pac_url, actual_config.pac_url()); |
554 EXPECT_TRUE(network_params.proxy_rules.Matches( | 554 EXPECT_TRUE(network_params.proxy_rules.Matches( |
555 actual_config.proxy_rules())); | 555 actual_config.proxy_rules())); |
556 } | 556 } |
557 } | 557 } |
558 | 558 |
559 } // namespace | 559 } // namespace |
560 | 560 |
561 } // namespace chromeos | 561 } // namespace chromeos |
OLD | NEW |