Better support for Cellular roaming state in ONC

chromeos/network/onc/onc_translator_shill_to_onc.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_translator.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/json/json_reader.h"
@@ skipping 325 matching lines @@
 void ShillToONCTranslator::TranslateWiMAXWithState() {
   CopyPropertiesAccordingToSignature();
   TranslateAndAddNestedObject(::onc::wimax::kEAP);
 }
 
 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)) {
     TranslateAndAddNestedObject(::onc::cellular::kServingOperator, *dictionary);
   }
   if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
         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;
-  if (!shill_dictionary_->GetDictionaryWithoutPathExpansion(
-          shill::kDeviceProperty, &device_dictionary)) {
-    return;
+  bool requires_roaming = false;
+  shill_dictionary_->GetDictionaryWithoutPathExpansion(
+      shill::kDeviceProperty, &device_dictionary);
+  if (device_dictionary) {
+    // Merge the Device dictionary with this one (Cellular) using the
+    // CellularDevice signature.
+    ShillToONCTranslator nested_translator(*device_dictionary,
+                                           onc_source_,
+                                           kCellularWithStateSignature,
+                                           kCellularDeviceTable);
+    scoped_ptr<base::DictionaryValue> nested_object =
+        nested_translator.CreateTranslatedONCObject();
+    onc_object_->MergeDictionary(nested_object.get());
+
+    /// Get the requires_roaming from the Device dictionary.
+    device_dictionary->GetBooleanWithoutPathExpansion(
+        shill::kProviderRequiresRoamingProperty, &requires_roaming);
   }
-  ShillToONCTranslator nested_translator(*device_dictionary,
-                                         onc_source_,
-                                         kCellularWithStateSignature,
-                                         kCellularDeviceTable);
-  scoped_ptr<base::DictionaryValue> nested_object =
-      nested_translator.CreateTranslatedONCObject();
-  onc_object_->MergeDictionary(nested_object.get());
+  if (requires_roaming) {
+    onc_object_->SetStringWithoutPathExpansion(
+        ::onc::celular::kRoamingState, ::onc::celular::kRoamingAlways);
+  } else {
+    TranslateWithTableAndSet(shill::kRoamingStateProperty,
+                             kRoamingStateTable,
+                             ::onc::cellular::kRoamingState);
+  }
 }
 
 void ShillToONCTranslator::TranslateCellularDevice() {
   CopyPropertiesAccordingToSignature();
   const base::DictionaryValue* shill_sim_lock_status = NULL;
   if (shill_dictionary_->GetDictionaryWithoutPathExpansion(
           shill::kSIMLockStatusProperty, &shill_sim_lock_status)) {
     TranslateAndAddNestedObject(::onc::cellular::kSIMLockStatus,
                                 *shill_sim_lock_status);
   }
@@ skipping 314 matching lines @@
     ::onc::ONCSource onc_source,
     const OncValueSignature* onc_signature) {
   CHECK(onc_signature != NULL);
 
   ShillToONCTranslator translator(shill_dictionary, onc_source, *onc_signature);
   return translator.CreateTranslatedONCObject();
 }
 
 }  // namespace onc
 }  // namespace chromeos