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 "chromeos/network/proxy/proxy_config_service_impl.h" | 5 #include "chromeos/network/proxy/proxy_config_service_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
515 SetUpSharedEthernet(); | 515 SetUpSharedEthernet(); |
516 SetUpProxyConfigService(&profile_prefs_); | 516 SetUpProxyConfigService(&profile_prefs_); |
517 | 517 |
518 std::unique_ptr<base::DictionaryValue> ethernet_policy( | 518 std::unique_ptr<base::DictionaryValue> ethernet_policy( |
519 chromeos::onc::ReadDictionaryFromJson(kEthernetPolicy)); | 519 chromeos::onc::ReadDictionaryFromJson(kEthernetPolicy)); |
520 | 520 |
521 std::unique_ptr<base::ListValue> network_configs(new base::ListValue); | 521 std::unique_ptr<base::ListValue> network_configs(new base::ListValue); |
522 network_configs->Append(std::move(ethernet_policy)); | 522 network_configs->Append(std::move(ethernet_policy)); |
523 | 523 |
524 profile_prefs_.SetUserPref(::proxy_config::prefs::kUseSharedProxies, | 524 profile_prefs_.SetUserPref(::proxy_config::prefs::kUseSharedProxies, |
525 new base::FundamentalValue(false)); | 525 new base::Value(false)); |
526 profile_prefs_.SetManagedPref(::onc::prefs::kOpenNetworkConfiguration, | 526 profile_prefs_.SetManagedPref(::onc::prefs::kOpenNetworkConfiguration, |
527 network_configs.release()); | 527 network_configs.release()); |
528 | 528 |
529 net::ProxyConfig actual_config; | 529 net::ProxyConfig actual_config; |
530 SyncGetLatestProxyConfig(&actual_config); | 530 SyncGetLatestProxyConfig(&actual_config); |
531 net::ProxyConfig expected_config = | 531 net::ProxyConfig expected_config = |
532 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x")); | 532 net::ProxyConfig::CreateFromCustomPacURL(GURL("http://domain.com/x")); |
533 EXPECT_TRUE(expected_config.Equals(actual_config)); | 533 EXPECT_TRUE(expected_config.Equals(actual_config)); |
534 } | 534 } |
535 | 535 |
536 } // namespace chromeos | 536 } // namespace chromeos |
OLD | NEW |