Translate activation/romaing state, restricted pool

chromeos/network/onc/onc_translation_tables.cc

Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index f8dee0e8bf43ad6ad50d0237bd15e4b711862b82..ff0a6e24334bb9cc3d5f7b4fcbc84386b564827d 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -152,9 +152,11 @@ const FieldTranslationEntry sim_lock_status_fields[] = {
 // For Device properties see kCellularDeviceTable.
 const FieldTranslationEntry cellular_fields[] = {
     { ::onc::cellular::kActivationType, shill::kActivationTypeProperty},
-    { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
     { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
-    { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
+    // This field is converted during translation, see onc_translator_*.
+    // { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
     {NULL}};
 
 const FieldTranslationEntry network_fields[] = {
@@ -174,6 +176,7 @@ const FieldTranslationEntry network_fields[] = {
     // onc_translator_shill_to_onc.cc. They are only converted when going from
     // Shill->ONC, and ignored otherwise.
     // { ::onc::network_config::kConnectionState, shill::kStateProperty },
+    // { ::onc::network_config::kRestricted, shill::kStateProperty },
     // { ::onc::network_config::kMacAddress, shill::kAddressProperty },
     {NULL}};
 
@@ -295,6 +298,19 @@ const StringTranslationEntry kEAP_TTLS_InnerTable[] = {
     { ::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
     {NULL}};
 
+const StringTranslationEntry kActivationStateTable[] = {
+    { ::onc::cellular::kActivated, shill::kActivationStateActivated},
+    { ::onc::cellular::kActivating, shill::kActivationStateActivating},
+    { ::onc::cellular::kNotActivated, shill::kActivationStateNotActivated},
+    { ::onc::cellular::kPartiallyActivated,
+      shill::kActivationStatePartiallyActivated},
+    {NULL}};
+
+const StringTranslationEntry kRoamingStateTable[] = {
+    { ::onc::cellular::kHome, shill::kRoamingStateHome},
+    { ::onc::cellular::kRoaming, shill::kRoamingStateRoaming},
+    {NULL}};
+
 // This must contain only Shill Device properties and no Service properties.
 // For Service properties see cellular_fields.
 const FieldTranslationEntry kCellularDeviceTable[] = {