Better support for Cellular roaming state in ONC

chromeos/network/onc/onc_translation_tables.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_translation_tables.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "components/onc/onc_constants.h"
@@ skipping 302 matching lines @@
 
 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},
+    {::onc::cellular::kRoamingHome, shill::kRoamingStateHome},

[armansito, 2015/02/25 19:44:46]

nit: it looks like there is a space after the opening brace in all other
declarations, I think it's better to be consistent.

[stevenjb, 2015/02/25 20:09:50]

Done (although clang complains about this; some day we should clang format this
directory as a separate CL).

+    {::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
     {NULL}};
 
 // This must contain only Shill Device properties and no Service properties.
 // For Service properties see cellular_fields.
 const FieldTranslationEntry kCellularDeviceTable[] = {
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kAPNList, shill::kCellularApnListProperty},
     { ::onc::cellular::kAllowRoaming, shill::kCellularAllowRoamingProperty},
     { ::onc::cellular::kCarrier, shill::kCarrierProperty},
     { ::onc::cellular::kESN, shill::kEsnProperty},
     { ::onc::cellular::kFamily, shill::kTechnologyFamilyProperty},
     { ::onc::cellular::kFirmwareRevision, shill::kFirmwareRevisionProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::cellular::kFoundNetworks, shill::kFoundNetworksProperty},
     { ::onc::cellular::kHardwareRevision, shill::kHardwareRevisionProperty},
     { ::onc::cellular::kHomeProvider, shill::kHomeProviderProperty},
     { ::onc::cellular::kICCID, shill::kIccidProperty},
     { ::onc::cellular::kIMEI, shill::kImeiProperty},
     { ::onc::cellular::kIMSI, shill::kImsiProperty},
     { ::onc::cellular::kManufacturer, shill::kManufacturerProperty},
     { ::onc::cellular::kMDN, shill::kMdnProperty},
     { ::onc::cellular::kMEID, shill::kMeidProperty},
     { ::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},
     { ::onc::cellular::kSupportedCarriers, shill::kSupportedCarriersProperty},
     { ::onc::cellular::kSupportNetworkScan, shill::kSupportNetworkScanProperty},
     {NULL}};
 
 const FieldTranslationEntry* GetFieldTranslationTable(
     const OncValueSignature& onc_signature) {
   for (const OncValueTranslationEntry* it = onc_value_translation_table;
@@ skipping 54 matching lines @@
       continue;
     *onc_value = table[i].onc_value;
     return true;
   }
   LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos