Use ONC for Cellular APN and SimLock in Settings

BUG=279351
For chrome/browser/ui/webui/chromeos/network_config_message_handler.cc:
TBR=xiyuan@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#292245}

7 files changed, 23 insertions, 7 deletions

diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index cb451e8..c47068b 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -99,6 +99,12 @@ bool NetworkState::PropertyChanged(const std::string& key,
     return GetStringValue(key, value, &activation_state_);
   } else if (key == shill::kRoamingStateProperty) {
     return GetStringValue(key, value, &roaming_);
+  } else if (key == shill::kPaymentPortalProperty) {
+    const base::DictionaryValue* olp;
+    if (!value.GetAsDictionary(&olp))
+      return false;
+    return olp->GetStringWithoutPathExpansion(shill::kPaymentPortalURL,
+                                              &payment_url_);
   } else if (key == shill::kSecurityProperty) {
     return GetStringValue(key, value, &security_);
   } else if (key == shill::kEapMethodProperty) {
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index b1a491b..5098389 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -87,6 +87,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   const std::string& activation_type() const { return activation_type_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
+  const std::string& payment_url() const { return payment_url_; }
   bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
 
   // Whether this network has a CACertNSS nickname set.
@@ -169,6 +170,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   std::string activation_type_;
   std::string activation_state_;
   std::string roaming_;
+  std::string payment_url_;
   bool cellular_out_of_credits_;
 
   // Whether a deprecated CaCertNSS property of this network is set. Required
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index 2b750fb..6b85eab 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -223,6 +223,7 @@ const OncFieldSignature cellular_provider_fields[] = {
     {NULL}};
 
 const OncFieldSignature cellular_apn_fields[] = {
+    { ::onc::cellular_apn::kAccessPointName, &kStringSignature},
     { ::onc::cellular_apn::kName, &kStringSignature},
     { ::onc::cellular_apn::kUsername, &kStringSignature},
     { ::onc::cellular_apn::kPassword, &kStringSignature},
@@ -264,6 +265,7 @@ const OncFieldSignature cellular_with_state_fields[] = {
     { ::onc::cellular::kICCID, &kStringSignature},
     { ::onc::cellular::kIMEI, &kStringSignature},
     { ::onc::cellular::kIMSI, &kStringSignature},
+    { ::onc::cellular::kLastGoodAPN, &kCellularApnSignature },
     { ::onc::cellular::kManufacturer, &kStringSignature},
     { ::onc::cellular::kMDN, &kStringSignature},
     { ::onc::cellular::kMEID, &kStringSignature},
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 3cf512c..b538145 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -120,7 +120,8 @@ const FieldTranslationEntry wifi_fields[] = {
     {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},
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 224e26c..1b1ba70 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -309,6 +309,10 @@ void ShillToONCTranslator::TranslateCellularWithState() {
         shill::kCellularApnProperty, &dictionary)) {
     TranslateAndAddNestedObject(::onc::cellular::kAPN, *dictionary);
   }
+  if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
+        shill::kCellularLastGoodApnProperty, &dictionary)) {
+    TranslateAndAddNestedObject(::onc::cellular::kLastGoodAPN, *dictionary);
+  }
   // Merge the Device dictionary with this one (Cellular) using the
   // CellularDevice signature.
   const base::DictionaryValue* device_dictionary = NULL;
diff --git a/chromeos/test/data/network/cellular.onc b/chromeos/test/data/network/cellular.onc
index 582d594..4c76e3fe 100644
--- a/chromeos/test/data/network/cellular.onc
+++ b/chromeos/test/data/network/cellular.onc
@@ -3,7 +3,7 @@
   "Name": "Test Network",
   "Cellular": {
     "APN": {
-      "Name": "test-apn",
+      "AccessPointName": "test-apn",
       "Username": "test-username",
       "Password": "test-password"
     }
diff --git a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
index d7d6b33..e57d057 100644
--- a/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_cellular_with_state.onc
@@ -15,24 +15,25 @@
       "Name": "test-name"
     },
     "APN": {
-      "Name": "test-apn",
+      "AccessPointName": "test-apn",
+      "Name": "test-apn-name",
       "Username": "test-username",
       "Password": "test-password"
     },
     "APNList": [ {
-        "Name": "test-apn0",
+        "AccessPointName": "test-apn0",
         "Password": "test-password0",
         "Username": "test-username0"
       }, {
-        "Name": "test-apn1",
+        "AccessPointName": "test-apn1",
         "Password": "test-password1",
         "Username": "test-username1"
       }, {
-        "Name": "test-apn2",
+        "AccessPointName": "test-apn2",
         "Password": "test-password2",
         "Username": "test-username2"
       }, {
-        "Name": "test-apn3",
+        "AccessPointName": "test-apn3",
         "Password": "test-password3",
         "Username": "test-username3"
       }