Correctly translate Cellular Device properties to ONC

This fixes how we translate the Device properties to ONC instead of
just copying the Shill properties.

BUG=279351

Review URL: https://codereview.chromium.org/402953004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285642 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 31 insertions, 4 deletions

diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 57df38e..f7e932b 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -101,9 +101,7 @@ const char kProviderRequiresRoaming[] = "ProviderRequiresRoaming";
 const char kRoamingState[] = "RoamingState";
 const char kSelectedNetwork[] = "SelectedNetwork";
 const char kServingOperator[] = "ServingOperator";
-const char kSIMLockEnabled[] = "SIMLockEnabled";
 const char kSIMLockStatus[] = "SIMLockStatus";
-const char kSIMLockType[] = "SIMLockType";
 const char kSIMPresent[] = "SIMPresent";
 const char kSupportedCarriers[] = "SupportedCarriers";
 const char kSupportNetworkScan[] = "SupportNetworkScan";
@@ -119,8 +117,24 @@ namespace cellular_apn {
 const char kName[] = "Name";
 const char kUsername[] = "Username";
 const char kPassword[] = "Password";
+const char kLocalizedName[] = "LocalizedName";
+const char kLanguage[] = "LocalizedName";
 }  // namespace cellular_apn
 
+namespace cellular_found_network {
+const char kStatus[] = "Status";
+const char kNetworkId[] = "NetworkId";
+const char kShortName[] = "ShortName";
+const char kLongName[] = "LongName";
+const char kTechnology[] = "Technology";
+}  // namespace cellular_apn
+
+namespace sim_lock_status {
+const char kLockEnabled[] = "LockEnabled";
+const char kLockType[] = "LockType";
+const char kRetriesLeft[] = "RetriesLeft";
+}
+
 namespace connection_state {
 const char kConnected[] = "Connected";
 const char kConnecting[] = "Connecting";
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index e3db4d7..ca85a76 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -118,9 +118,7 @@ ONC_EXPORT extern const char kProviderRequiresRoaming[];
 ONC_EXPORT extern const char kRoamingState[];
 ONC_EXPORT extern const char kSelectedNetwork[];
 ONC_EXPORT extern const char kServingOperator[];
-ONC_EXPORT extern const char kSIMLockEnabled[];
 ONC_EXPORT extern const char kSIMLockStatus[];
-ONC_EXPORT extern const char kSIMLockType[];
 ONC_EXPORT extern const char kSIMPresent[];
 ONC_EXPORT extern const char kSupportedCarriers[];
 ONC_EXPORT extern const char kSupportNetworkScan[];
@@ -136,8 +134,23 @@ namespace cellular_apn {
 ONC_EXPORT extern const char kName[];
 ONC_EXPORT extern const char kUsername[];
 ONC_EXPORT extern const char kPassword[];
+ONC_EXPORT extern const char kLocalizedName[];
+ONC_EXPORT extern const char kLanguage[];
 }  // namespace cellular_apn
 
+namespace cellular_found_network {
+ONC_EXPORT extern const char kStatus[];
+ONC_EXPORT extern const char kNetworkId[];
+ONC_EXPORT extern const char kShortName[];
+ONC_EXPORT extern const char kLongName[];
+ONC_EXPORT extern const char kTechnology[];
+}  // namespace cellular_found_network
+
+namespace sim_lock_status {
+ONC_EXPORT extern const char kLockEnabled[];
+ONC_EXPORT extern const char kLockType[];
+ONC_EXPORT extern const char kRetriesLeft[];
+}  // namespace sim_lock_status
 
 namespace connection_state {
 ONC_EXPORT extern const char kConnected[];