This adds Cellular to the Shill to ONC translation.

chromeos/network/onc/onc_constants.h

 // 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.
 #ifndef CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_
 #define CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_
 
 #include "chromeos/chromeos_export.h"
 
 namespace chromeos {
 
 // Constants for ONC properties.
 namespace onc {
 
 // Indicates from which source an ONC blob comes from.
 enum ONCSource {
   ONC_SOURCE_NONE,
   ONC_SOURCE_USER_IMPORT,
   ONC_SOURCE_DEVICE_POLICY,
   ONC_SOURCE_USER_POLICY,
 };
 
 // Top Level ONC.

[pneubeck (no reviews), 2013/01/18 10:27:41]

remove old comment
add:

// ToplevelConfiguration.
namespace toplevel_config {
  ... kType[];
...
} ...

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Done.

 CHROMEOS_EXPORT extern const char kCertificates[];
 CHROMEOS_EXPORT extern const char kEncryptedConfiguration[];
 CHROMEOS_EXPORT extern const char kNetworkConfigurations[];
 CHROMEOS_EXPORT extern const char kUnencryptedConfiguration[];
 
 // This is no ONC key or value but used for logging only.
 // TODO(pneubeck): Remove.
 CHROMEOS_EXPORT extern const char kNetworkConfiguration[];
 
 // Common keys/values.
 CHROMEOS_EXPORT extern const char kRecommended[];
 CHROMEOS_EXPORT extern const char kRemove[];
 
 // NetworkConfiguration.
-// TODO(pneubeck): Put into namespace.
+namespace network_config {
 CHROMEOS_EXPORT extern const char kCellular[];
 CHROMEOS_EXPORT extern const char kEthernet[];
 CHROMEOS_EXPORT extern const char kGUID[];

[pneubeck (no reviews), 2013/01/18 10:27:41]

should really be identical for both certificates and networks -> keep in the
chromeos::onc namespace

(otherwise add certificate::kGUID)

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Added certificate::kGUID

 CHROMEOS_EXPORT extern const char kIPConfigs[];
 CHROMEOS_EXPORT extern const char kName[];
 CHROMEOS_EXPORT extern const char kNameServers[];
 CHROMEOS_EXPORT extern const char kProxySettings[];
 CHROMEOS_EXPORT extern const char kSearchDomains[];
+CHROMEOS_EXPORT extern const char kServicePath[];
+CHROMEOS_EXPORT extern const char kState[];
 CHROMEOS_EXPORT extern const char kType[];
 CHROMEOS_EXPORT extern const char kVPN[];
 CHROMEOS_EXPORT extern const char kWiFi[];
+}  // namespace network_config
+
+namespace network_type {

[pneubeck (no reviews), 2013/01/18 10:27:41]

We didn't differentiate type values from field names in other cases, too. E.g.
in vpn:: kOpenVPN is both field and value.
A nice side-effect of that was, that you can do (onc_validator.cc:437)
  result->GetStringWithoutPathExpansion(kType, &type);
  RequireField(*result, type);


If we still want to change it, I would prefer to
 - rename to kType*, e.g. kCellular to kTypeCellular
 - and move them into network_config namespace

I can adapt the remaining types in a follow-up CL.

I'm fine with both variants, where differentiating types values/fields names is
formally more correct.

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Well, but the network_type namespace nicely groups them so that you know what
"all" set kAllTypes could possibly refer to.
 
I'd like to make them separate: it's formally more correct, and is less prone to
error if the string for a value changes but a field name doesn't (for instance).
 Granted, we have control over both through the spec, but it seems better to let
them vary independently and understand which thing (value or field) is being
referred to in the code.

+CHROMEOS_EXPORT extern const char kAllTypes[];
+CHROMEOS_EXPORT extern const char kCellular[];
+CHROMEOS_EXPORT extern const char kEthernet[];
+CHROMEOS_EXPORT extern const char kVPN[];
+CHROMEOS_EXPORT extern const char kWiFi[];
+}  // namespace network_type
+
+namespace cellular {
+CHROMEOS_EXPORT extern const char kActivateOverNonCellularNetwork[];
+CHROMEOS_EXPORT extern const char kActivationState[];
+CHROMEOS_EXPORT extern const char kAllowRoaming[];
+CHROMEOS_EXPORT extern const char kAPN[];
+CHROMEOS_EXPORT extern const char kCarrier[];
+CHROMEOS_EXPORT extern const char kESN[];
+CHROMEOS_EXPORT extern const char kFamily[];
+CHROMEOS_EXPORT extern const char kFirmwareRevision[];
+CHROMEOS_EXPORT extern const char kFoundNetworks[];
+CHROMEOS_EXPORT extern const char kHardwareRevision[];
+CHROMEOS_EXPORT extern const char kHomeProvider[];
+CHROMEOS_EXPORT extern const char kICCID[];
+CHROMEOS_EXPORT extern const char kIMEI[];
+CHROMEOS_EXPORT extern const char kIMSI[];
+CHROMEOS_EXPORT extern const char kManufacturer[];
+CHROMEOS_EXPORT extern const char kMDN[];
+CHROMEOS_EXPORT extern const char kMEID[];
+CHROMEOS_EXPORT extern const char kMIN[];
+CHROMEOS_EXPORT extern const char kModelID[];
+CHROMEOS_EXPORT extern const char kNetworkTechnology[];
+CHROMEOS_EXPORT extern const char kOperatorCode[];
+CHROMEOS_EXPORT extern const char kOperatorName[];
+CHROMEOS_EXPORT extern const char kPRLVersion[];
+CHROMEOS_EXPORT extern const char kProviderRequiresRoaming[];
+CHROMEOS_EXPORT extern const char kRoamingState[];
+CHROMEOS_EXPORT extern const char kSelectedNetwork[];
+CHROMEOS_EXPORT extern const char kServingOperator[];
+CHROMEOS_EXPORT extern const char kSIMLockStatus[];
+CHROMEOS_EXPORT extern const char kSIMPresent[];
+CHROMEOS_EXPORT extern const char kSupportedCarriers[];
+CHROMEOS_EXPORT extern const char kSupportNetworkScan[];
+}  // namespace cellular
+
+namespace status {
+CHROMEOS_EXPORT extern const char kConnected[];
+CHROMEOS_EXPORT extern const char kConnecting[];
+CHROMEOS_EXPORT extern const char kNotConnected[];
+}  // namespace status
 
 namespace ipconfig {
 CHROMEOS_EXPORT extern const char kGateway[];
 CHROMEOS_EXPORT extern const char kIPAddress[];
 CHROMEOS_EXPORT extern const char kIPv4[];
 CHROMEOS_EXPORT extern const char kIPv6[];
 CHROMEOS_EXPORT extern const char kRoutingPrefix[];
 CHROMEOS_EXPORT extern const char kType[];
 }  // namespace ipconfig
 
 namespace ethernet {
 CHROMEOS_EXPORT extern const char kAuthentication[];
 CHROMEOS_EXPORT extern const char kEAP[];
 CHROMEOS_EXPORT extern const char kNone[];
 CHROMEOS_EXPORT extern const char k8021X[];
 }  // namespace ethernet
 
 namespace wifi {
 CHROMEOS_EXPORT extern const char kAutoConnect[];
+CHROMEOS_EXPORT extern const char kBSSID[];
 CHROMEOS_EXPORT extern const char kEAP[];
 CHROMEOS_EXPORT extern const char kHiddenSSID[];
 CHROMEOS_EXPORT extern const char kNone[];
 CHROMEOS_EXPORT extern const char kPassphrase[];
 CHROMEOS_EXPORT extern const char kProxyURL[];
 CHROMEOS_EXPORT extern const char kSecurity[];
 CHROMEOS_EXPORT extern const char kSSID[];
 CHROMEOS_EXPORT extern const char kWEP_PSK[];
 CHROMEOS_EXPORT extern const char kWEP_8021X[];
 CHROMEOS_EXPORT extern const char kWPA_PSK[];
@@ skipping 28 matching lines @@
 CHROMEOS_EXPORT extern const char kCipher[];
 CHROMEOS_EXPORT extern const char kCiphertext[];
 CHROMEOS_EXPORT extern const char kHMACMethod[];
 CHROMEOS_EXPORT extern const char kHMAC[];
 CHROMEOS_EXPORT extern const char kIV[];
 CHROMEOS_EXPORT extern const char kIterations[];
 CHROMEOS_EXPORT extern const char kPBKDF2[];
 CHROMEOS_EXPORT extern const char kSHA1[];
 CHROMEOS_EXPORT extern const char kSalt[];
 CHROMEOS_EXPORT extern const char kStretch[];
 CHROMEOS_EXPORT extern const char kType[];

[pneubeck (no reviews), 2013/01/18 10:27:41]

that one slipped in because of the workaround in the onc spec. Should be
replaced by the above toplevel_config::kType

[Greg Spencer (Chromium), 2013/01/18 22:27:44]

Done.

 }  // namespace encrypted
 
 namespace eap {
 CHROMEOS_EXPORT extern const char kAnonymousIdentity[];
 CHROMEOS_EXPORT extern const char kAutomatic[];
 CHROMEOS_EXPORT extern const char kClientCertPattern[];
 CHROMEOS_EXPORT extern const char kClientCertRef[];
 CHROMEOS_EXPORT extern const char kClientCertType[];
 CHROMEOS_EXPORT extern const char kEAP_AKA[];
 CHROMEOS_EXPORT extern const char kEAP_FAST[];
@@ skipping 84 matching lines @@
 CHROMEOS_EXPORT extern const char kSocks[];
 CHROMEOS_EXPORT extern const char kType[];
 CHROMEOS_EXPORT extern const char kWPAD[];
 }  // namespace proxy
 
 }  // namespace onc
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_CONSTANTS_H_