diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 13:08:30 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-14 13:08:30 +0000 |
| commit | b1eff5b6e58841c1b4551a90f853b4f7a59e70f3 (patch) | |
| tree | e2028b271b8c938de2ec91f1ab1b74e106ef2266 /chromeos/dbus/shill_client_unittest_base.cc | |
| parent | 65295fbe26224e77949b1624bf5d14b9c0ce1b99 (diff) | |
| download | chromium_src-b1eff5b6e58841c1b4551a90f853b4f7a59e70f3.zip chromium_src-b1eff5b6e58841c1b4551a90f853b4f7a59e70f3.tar.gz chromium_src-b1eff5b6e58841c1b4551a90f853b4f7a59e70f3.tar.bz2 | |
Consistently use HexSSID instead of SSID in Chrome.
Previously a complex combination of shill::kSSIDProperty, shill::kWiFiHexSsid and shill::kNameProperty were used to reconstruct the actual ssid of a network.
Instead, Chrome now completely ignores kSSIDProperty. This will also simplify configuration of networks, because HexSSID can be read from a profile and be used for configuration afterwards.
This CL depends on adaptions on Shill's side (always provide and accept HexSSID).
BUG=285773
Review URL: https://codereview.chromium.org/25488003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/shill_client_unittest_base.cc')
| -rw-r--r-- | chromeos/dbus/shill_client_unittest_base.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc index ccc481c..f53586f 100644 --- a/chromeos/dbus/shill_client_unittest_base.cc +++ b/chromeos/dbus/shill_client_unittest_base.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/json/json_writer.h" #include "base/values.h" +#include "chromeos/network/shill_property_util.h" #include "dbus/message.h" #include "dbus/object_path.h" #include "dbus/values_util.h" @@ -288,9 +289,7 @@ ShillClientUnittestBase::CreateExampleServiceProperties() { properties->SetWithoutPathExpansion( shill::kTypeProperty, base::Value::CreateStringValue(shill::kTypeWifi)); - properties->SetWithoutPathExpansion( - shill::kSSIDProperty, - base::Value::CreateStringValue("testssid")); + shill_property_util::SetSSID("testssid", properties); properties->SetWithoutPathExpansion( shill::kSecurityProperty, base::Value::CreateStringValue(shill::kSecurityPsk)); |