OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/dbus/fake_shill_manager_client.h" | 5 #include "chromeos/dbus/fake_shill_manager_client.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
604 // IPConfigs | 604 // IPConfigs |
605 base::DictionaryValue ipconfig_v4_dictionary; | 605 base::DictionaryValue ipconfig_v4_dictionary; |
606 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( | 606 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( |
607 shill::kAddressProperty, "100.0.0.1"); | 607 shill::kAddressProperty, "100.0.0.1"); |
608 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( | 608 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( |
609 shill::kGatewayProperty, "100.0.0.2"); | 609 shill::kGatewayProperty, "100.0.0.2"); |
610 ipconfig_v4_dictionary.SetIntegerWithoutPathExpansion( | 610 ipconfig_v4_dictionary.SetIntegerWithoutPathExpansion( |
611 shill::kPrefixlenProperty, 1); | 611 shill::kPrefixlenProperty, 1); |
612 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( | 612 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( |
613 shill::kMethodProperty, shill::kTypeIPv4); | 613 shill::kMethodProperty, shill::kTypeIPv4); |
| 614 ipconfig_v4_dictionary.SetStringWithoutPathExpansion( |
| 615 shill::kWebProxyAutoDiscoveryUrlProperty, "http://wpad.com/wpad.dat"); |
614 ip_configs->AddIPConfig("ipconfig_v4_path", ipconfig_v4_dictionary); | 616 ip_configs->AddIPConfig("ipconfig_v4_path", ipconfig_v4_dictionary); |
615 base::DictionaryValue ipconfig_v6_dictionary; | 617 base::DictionaryValue ipconfig_v6_dictionary; |
616 ipconfig_v6_dictionary.SetStringWithoutPathExpansion( | 618 ipconfig_v6_dictionary.SetStringWithoutPathExpansion( |
617 shill::kAddressProperty, "0:0:0:0:100:0:0:1"); | 619 shill::kAddressProperty, "0:0:0:0:100:0:0:1"); |
618 ipconfig_v6_dictionary.SetStringWithoutPathExpansion( | 620 ipconfig_v6_dictionary.SetStringWithoutPathExpansion( |
619 shill::kMethodProperty, shill::kTypeIPv6); | 621 shill::kMethodProperty, shill::kTypeIPv6); |
620 ip_configs->AddIPConfig("ipconfig_v6_path", ipconfig_v6_dictionary); | 622 ip_configs->AddIPConfig("ipconfig_v6_path", ipconfig_v6_dictionary); |
621 | 623 |
622 bool enabled; | 624 bool enabled; |
623 std::string state; | 625 std::string state; |
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1167 *enabled = true; | 1169 *enabled = true; |
1168 if ((state == shill::kStatePortal && type != shill::kTypeWifi) || | 1170 if ((state == shill::kStatePortal && type != shill::kTypeWifi) || |
1169 (state == kNetworkActivated && type != shill::kTypeCellular)) { | 1171 (state == kNetworkActivated && type != shill::kTypeCellular)) { |
1170 LOG(WARNING) << "Invalid state: " << state << " for " << type; | 1172 LOG(WARNING) << "Invalid state: " << state << " for " << type; |
1171 return shill::kStateIdle; | 1173 return shill::kStateIdle; |
1172 } | 1174 } |
1173 return state; | 1175 return state; |
1174 } | 1176 } |
1175 | 1177 |
1176 } // namespace chromeos | 1178 } // namespace chromeos |
OLD | NEW |