Translate activation/romaing state, restricted pool

chromeos/network/onc/onc_translator_shill_to_onc.cc

Index: chromeos/network/onc/onc_translator_shill_to_onc.cc
diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index 3abb44375c531743470b227a757659f8c48be251..168f0b14597c546d847a2d6b4000dc03efde43b1 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc
@@ -315,6 +315,12 @@ void ShillToONCTranslator::TranslateWiFiWithState() {
 
 void ShillToONCTranslator::TranslateCellularWithState() {
   CopyPropertiesAccordingToSignature();
+  TranslateWithTableAndSet(shill::kActivationStateProperty,
+                           kActivationStateTable,
+                           ::onc::cellular::kActivationState);
+  TranslateWithTableAndSet(shill::kRoamingStateProperty,
+                           kRoamingStateTable,
+                           ::onc::cellular::kRoamingState);
   const base::DictionaryValue* dictionary = NULL;
   if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
         shill::kServingOperatorProperty, &dictionary)) {
@@ -402,6 +408,11 @@ void ShillToONCTranslator::TranslateNetworkWithState() {
     }
     onc_object_->SetStringWithoutPathExpansion(
         ::onc::network_config::kConnectionState, onc_state);
+    // Only set 'RestrictedConnectivity' if true.
+    if (state == shill::kStatePortal) {
+      onc_object_->SetBooleanWithoutPathExpansion(
+          ::onc::network_config::kRestrictedConnectivity, true);
+    }
   }
 
   // Use a human-readable aa:bb format for any hardware MAC address. Note: