Better support for Cellular roaming state in ONC

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 fb1621754761a8ef967281309a44c7c3139884a2..f819b4723b24a9e81d9146ff09438af37da1722d 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -320,8 +320,8 @@ const StringTranslationEntry kActivationStateTable[] = {
     {NULL}};
 
 const StringTranslationEntry kRoamingStateTable[] = {
-    { ::onc::cellular::kHome, shill::kRoamingStateHome},
-    { ::onc::cellular::kRoaming, shill::kRoamingStateRoaming},
+    {::onc::cellular::kRoamingHome, shill::kRoamingStateHome},
+    {::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
     {NULL}};
 
 // This must contain only Shill Device properties and no Service properties.
@@ -347,8 +347,6 @@ const FieldTranslationEntry kCellularDeviceTable[] = {
     { ::onc::cellular::kMIN, shill::kMinProperty},
     { ::onc::cellular::kModelID, shill::kModelIDProperty},
     { ::onc::cellular::kPRLVersion, shill::kPRLVersionProperty},
-    { ::onc::cellular::kProviderRequiresRoaming,
-      shill::kProviderRequiresRoamingProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kSIMLockStatus, shill::kSIMLockStatusProperty},
     { ::onc::cellular::kSIMPresent, shill::kSIMPresentProperty},