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}

3 files changed, 0 insertions, 31 deletions

diff --git a/components/wifi/fake_wifi_service.cc b/components/wifi/fake_wifi_service.cc
index 7246d9b..a35d002 100644
--- a/components/wifi/fake_wifi_service.cc
+++ b/components/wifi/fake_wifi_service.cc
@@ -5,7 +5,6 @@
 #include "components/wifi/fake_wifi_service.h"
 
 #include "base/bind.h"
-#include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
 #include "components/onc/onc_constants.h"
 
@@ -23,25 +22,6 @@ FakeWiFiService::FakeWiFiService() {
     network_properties.ssid = "wifi1";
     network_properties.security = onc::wifi::kWEP_PSK;
     network_properties.signal_strength = 40;
-    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]"
-      "  }"
-      "}";
     networks_.push_back(network_properties);
   }
   {
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();
 }
 
diff --git a/components/wifi/network_properties.h b/components/wifi/network_properties.h
index 8e4d179..8483e98 100644
--- a/components/wifi/network_properties.h
+++ b/components/wifi/network_properties.h
@@ -48,8 +48,6 @@ struct WIFI_EXPORT NetworkProperties {
   Frequency frequency;
   FrequencySet frequency_set;
 
-  std::string json_extra;  // Extra JSON properties for unit tests
-
   scoped_ptr<base::DictionaryValue> ToValue(bool network_list) const;
   // Updates only properties set in |value|.
   bool UpdateFromValue(const base::DictionaryValue& value);