summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-07-10 15:34:21 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-10 22:34:52 +0000
commitd9ca8bd6f034b0b9b6e8f31b28ab43b3442b18f0 (patch)
treea0346c4244bff4915fd7acd342362835630aa555 /chromeos
parent85736428d58d053ced58a706c56dcc6cecca9db9 (diff)
downloadchromium_src-d9ca8bd6f034b0b9b6e8f31b28ab43b3442b18f0.zip
chromium_src-d9ca8bd6f034b0b9b6e8f31b28ab43b3442b18f0.tar.gz
chromium_src-d9ca8bd6f034b0b9b6e8f31b28ab43b3442b18f0.tar.bz2
Add network proxy input to md-settings internet details
BUG=481563 Review URL: https://codereview.chromium.org/1219753007 Cr-Commit-Position: refs/heads/master@{#338383}
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/dbus/fake_shill_manager_client.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc
index c9788cc..e8ca30b 100644
--- a/chromeos/dbus/fake_shill_manager_client.cc
+++ b/chromeos/dbus/fake_shill_manager_client.cc
@@ -611,6 +611,8 @@ void FakeShillManagerClient::SetupDefaultEnvironment() {
shill::kPrefixlenProperty, 1);
ipconfig_v4_dictionary.SetStringWithoutPathExpansion(
shill::kMethodProperty, shill::kTypeIPv4);
+ ipconfig_v4_dictionary.SetStringWithoutPathExpansion(
+ shill::kWebProxyAutoDiscoveryUrlProperty, "http://wpad.com/wpad.dat");
ip_configs->AddIPConfig("ipconfig_v4_path", ipconfig_v4_dictionary);
base::DictionaryValue ipconfig_v6_dictionary;
ipconfig_v6_dictionary.SetStringWithoutPathExpansion(