diff options
| author | stevenjb <stevenjb@chromium.org> | 2015-02-19 12:23:04 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 20:23:59 +0000 |
| commit | 813326fdc8dff24091cd7b8def4f65142e1af07f (patch) | |
| tree | 3b1cabe76c95643d12aca2db97fbc3d0dccee09b /components/wifi/network_properties.cc | |
| parent | c4dcbb42d9e58392456eb1a9984b4bd0c3f7e565 (diff) | |
| download | chromium_src-813326fdc8dff24091cd7b8def4f65142e1af07f.zip chromium_src-813326fdc8dff24091cd7b8def4f65142e1af07f.tar.gz chromium_src-813326fdc8dff24091cd7b8def4f65142e1af07f.tar.bz2 | |
Separate networkingPrivate ServiceClient API test expectations
Maintaining the test expectations across two very different
implementations is challenging at best. Separate the test expectations.
BUG=371442
Review URL: https://codereview.chromium.org/929793007
Cr-Commit-Position: refs/heads/master@{#317123}
Diffstat (limited to 'components/wifi/network_properties.cc')
| -rw-r--r-- | components/wifi/network_properties.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/components/wifi/network_properties.cc b/components/wifi/network_properties.cc index 49aeb69..68af452 100644 --- a/components/wifi/network_properties.cc +++ b/components/wifi/network_properties.cc @@ -4,7 +4,6 @@ #include "components/wifi/network_properties.h" -#include "base/json/json_reader.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" @@ -60,14 +59,6 @@ scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue( } value->Set(onc::network_type::kWiFi, wifi.release()); - if (!network_list && !json_extra.empty()) { - base::Value* value_extra = base::JSONReader::Read(json_extra); - CHECK(value_extra); - base::DictionaryValue* value_dictionary; - if (value_extra->GetAsDictionary(&value_dictionary)) - value->MergeDictionary(value_dictionary); - } - return value.Pass(); } |