summaryrefslogtreecommitdiffstats
path: root/components/wifi/fake_wifi_service.cc
diff options
context:
space:
mode:
authorstevenjb <stevenjb@chromium.org>2015-01-08 14:40:59 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-08 22:41:50 +0000
commitd97aaeeea89b28d50f76fa394231594897549150 (patch)
tree002af45648e3823d206a143821826fcefb2abb87 /components/wifi/fake_wifi_service.cc
parent1b94725221fbb5ff55a0cc6990cb5b5149cdf4d2 (diff)
downloadchromium_src-d97aaeeea89b28d50f76fa394231594897549150.zip
chromium_src-d97aaeeea89b28d50f76fa394231594897549150.tar.gz
chromium_src-d97aaeeea89b28d50f76fa394231594897549150.tar.bz2
Use setProperties for IP Config.
This changes the settings UI to use networkingPrivate.setProperties for setting IP config related properties. It is dependent on the ONC changes in https://codereview.chromium.org/749013003/. BUG=430113 For components/wifi/fake_wifi_service.cc (test expecations): TBR=mef@chromium.org Review URL: https://codereview.chromium.org/708563005 Cr-Commit-Position: refs/heads/master@{#310617}
Diffstat (limited to 'components/wifi/fake_wifi_service.cc')
-rw-r--r--components/wifi/fake_wifi_service.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/wifi/fake_wifi_service.cc b/components/wifi/fake_wifi_service.cc
index e1adce0..7c805b5 100644
--- a/components/wifi/fake_wifi_service.cc
+++ b/components/wifi/fake_wifi_service.cc
@@ -26,12 +26,17 @@ FakeWiFiService::FakeWiFiService() {
network_properties.json_extra =
"{"
" \"MacAddress\": \"00:11:22:AA:BB:CC\","
+ " \"IPAddressConfigType\": \"Static\","
" \"IPConfigs\": [{"
" \"Gateway\": \"0.0.0.1\","
" \"IPAddress\": \"0.0.0.0\","
" \"RoutingPrefix\": 0,"
" \"Type\": \"IPv4\""
" }],"
+ " \"StaticIPConfig\": {"
+ " \"IPAddress\": \"1.2.3.4\","
+ " \"Type\": \"IPv4\""
+ " },"
" \"WiFi\": {"
" \"Frequency\": 2400,"
" \"FrequencyList\": [2400]"