Use ONC for Cellular APN and SimLock in Settings

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 102 matching lines @@
     { ::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
     { ::onc::wifi::kPassphrase, shill::kPassphraseProperty},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::wifi::kSSID, shill::kWifiHexSsid},
     // This field is converted during translation, see onc_translator_*.
     // { ::onc::wifi::kSecurity, shill::kSecurityProperty },
     { ::onc::wifi::kSignalStrength, shill::kSignalStrengthProperty},
     {NULL}};
 
 const FieldTranslationEntry cellular_apn_fields[] = {
-    { ::onc::cellular_apn::kName, shill::kApnProperty},
+    { ::onc::cellular_apn::kAccessPointName, shill::kApnProperty},
+    { ::onc::cellular_apn::kName, shill::kApnNameProperty},
     { ::onc::cellular_apn::kUsername, shill::kApnUsernameProperty},
     { ::onc::cellular_apn::kPassword, shill::kApnPasswordProperty},
     { ::onc::cellular_apn::kLocalizedName, shill::kApnLocalizedNameProperty},
     { ::onc::cellular_apn::kLanguage, shill::kApnLanguageProperty},
     {NULL}};
 
 const FieldTranslationEntry cellular_found_network_fields[] = {
     { ::onc::cellular_found_network::kNetworkId, shill::kNetworkIdProperty},
     { ::onc::cellular_found_network::kStatus, shill::kStatusProperty},
     { ::onc::cellular_found_network::kTechnology, shill::kTechnologyProperty},
@@ skipping 233 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