[CrOS Tether] Remove the ManagedTetherProperties dictionary.

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 148 matching lines @@
     {::onc::vpn::kThirdPartyVpn, &kThirdPartyVPNSignature},
     {::onc::vpn::kType, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature ethernet_fields[] = {
     {::onc::kRecommended, &kRecommendedSignature},
     {::onc::ethernet::kAuthentication, &kStringSignature},
     {::onc::ethernet::kEAP, &kEAPSignature},
     {NULL}};
 
-const OncFieldSignature tether_fields[] = {
+const OncFieldSignature tether_fields[] = {{NULL}};
+
+const OncFieldSignature tether_with_state_fields[] = {
     {::onc::tether::kBatteryPercentage, &kIntegerSignature},
     {::onc::tether::kCarrier, &kStringSignature},
     {::onc::tether::kSignalStrength, &kIntegerSignature},
     {NULL}};
 
 const OncFieldSignature ipconfig_fields[] = {
     {::onc::ipconfig::kGateway, &kStringSignature},
     {::onc::ipconfig::kIPAddress, &kStringSignature},
     {::onc::ipconfig::kNameServers, &kStringListSignature},
     {::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
@@ skipping 148 matching lines @@
 const OncFieldSignature network_with_state_fields[] = {
     {::onc::network_config::kCellular, &kCellularWithStateSignature},
     {::onc::network_config::kConnectionState, &kStringSignature},
     {::onc::network_config::kConnectable, &kBoolSignature},
     {::onc::network_config::kErrorState, &kStringSignature},
     {::onc::network_config::kIPConfigs, &kIPConfigListSignature},
     {::onc::network_config::kMacAddress, &kStringSignature},
     {::onc::network_config::kRestrictedConnectivity, &kBoolSignature},
     {::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
     {::onc::network_config::kSource, &kStringSignature},
-    {::onc::network_config::kTether, &kTetherSignature},
+    {::onc::network_config::kTether, &kTetherWithStateSignature},
     {::onc::network_config::kWiFi, &kWiFiWithStateSignature},
     {::onc::network_config::kWimax, &kWiMAXWithStateSignature},
     {NULL}};
 
 const OncFieldSignature global_network_configuration_fields[] = {
     {::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
      &kBoolSignature},
     {::onc::global_network_config::kAllowOnlyPolicyNetworksToConnect,
      &kBoolSignature},
     {::onc::global_network_config::kDisableNetworkTypes, &kStringListSignature},
@@ skipping 44 matching lines @@
 const OncValueSignature kOpenVPNSignature = {base::Value::Type::DICTIONARY,
                                              openvpn_fields, NULL};
 const OncValueSignature kThirdPartyVPNSignature = {
     base::Value::Type::DICTIONARY, third_party_vpn_fields, NULL};
 const OncValueSignature kVerifyX509Signature = {base::Value::Type::DICTIONARY,
                                                 verify_x509_fields, NULL};
 const OncValueSignature kVPNSignature = {base::Value::Type::DICTIONARY,
                                          vpn_fields, NULL};
 const OncValueSignature kEthernetSignature = {base::Value::Type::DICTIONARY,
                                               ethernet_fields, NULL};
-const OncValueSignature kTetherSignature = {base::Value::Type::DICTIONARY,
-                                            tether_fields, NULL};
 const OncValueSignature kIPConfigSignature = {base::Value::Type::DICTIONARY,
                                               ipconfig_fields, NULL};
 const OncValueSignature kSavedIPConfigSignature = {
     base::Value::Type::DICTIONARY, ipconfig_fields, NULL};
 const OncValueSignature kStaticIPConfigSignature = {
     base::Value::Type::DICTIONARY, ipconfig_fields, NULL};
 const OncValueSignature kProxyLocationSignature = {
     base::Value::Type::DICTIONARY, proxy_location_fields, NULL};
 const OncValueSignature kProxyManualSignature = {base::Value::Type::DICTIONARY,
                                                  proxy_manual_fields, NULL};
@@ skipping 16 matching lines @@
 const OncValueSignature kToplevelConfigurationSignature = {
     base::Value::Type::DICTIONARY, toplevel_configuration_fields, NULL};
 
 // Derived "ONC with State" signatures.
 const OncValueSignature kNetworkWithStateSignature = {
     base::Value::Type::DICTIONARY, network_with_state_fields, NULL,
     &kNetworkConfigurationSignature};
 const OncValueSignature kWiFiWithStateSignature = {
     base::Value::Type::DICTIONARY, wifi_with_state_fields, NULL,
     &kWiFiSignature};
+const OncValueSignature kTetherSignature = {base::Value::Type::DICTIONARY,
+                                            tether_fields, NULL};
+const OncValueSignature kTetherWithStateSignature = {
+    base::Value::Type::DICTIONARY, tether_with_state_fields, NULL,
+    &kTetherSignature};
 const OncValueSignature kWiMAXWithStateSignature = {
     base::Value::Type::DICTIONARY, wimax_with_state_fields, NULL,
     &kWiMAXSignature};
 const OncValueSignature kCellularSignature = {base::Value::Type::DICTIONARY,
                                               cellular_fields, NULL};
 const OncValueSignature kCellularWithStateSignature = {
     base::Value::Type::DICTIONARY, cellular_with_state_fields, NULL,
     &kCellularSignature};
 const OncValueSignature kCellularPaymentPortalSignature = {
     base::Value::Type::DICTIONARY, cellular_payment_portal_fields, NULL};
@@ skipping 47 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos