Better support for Cellular roaming state in ONC

chromeos/network/network_util.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/network_util.h"
 
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chromeos/login/login_state.h"
+#include "chromeos/network/device_state.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translation_tables.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
@@ skipping 118 matching lines @@
     dict->GetStringWithoutPathExpansion(shill::kTechnologyProperty,
                                         &scan_result.technology);
     scan_results->push_back(scan_result);
   }
   return true;
 }
 
 scoped_ptr<base::DictionaryValue> TranslateNetworkStateToONC(
     const NetworkState* network) {
   // Get the properties from the NetworkState.
-  base::DictionaryValue shill_dictionary;
-  network->GetStateProperties(&shill_dictionary);
+  scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
+  network->GetStateProperties(shill_dictionary.get());
+
+  // Get any Device properties required to translate state.
+  if (NetworkTypePattern::Cellular().MatchesType(network->type())) {
+    // We need to set Device[Cellular.ProviderRequiresRoaming] so that
+    // Cellular[RoamingState] can be set correctly for badging network icons.
+    const DeviceState* device =
+        NetworkHandler::Get()->network_state_handler()->GetDeviceState(
+            network->device_path());
+    if (device) {
+      scoped_ptr<base::DictionaryValue> device_dict(new base::DictionaryValue);
+      device_dict->SetBooleanWithoutPathExpansion(
+          shill::kProviderRequiresRoamingProperty,
+          device->provider_requires_roaming());
+      shill_dictionary->SetWithoutPathExpansion(shill::kDeviceProperty,
+                                                device_dict.release());
+    }
+  }
 
   // NetworkState is always associated with the primary user profile, regardless
   // of what profile is associated with the page that calls this method. We do
   // not expose any sensitive properties in the resulting dictionary, it is
   // only used to show connection state and icons.
   std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();
   ::onc::ONCSource onc_source = ::onc::ONC_SOURCE_NONE;
   NetworkHandler::Get()
       ->managed_network_configuration_handler()
       ->FindPolicyByGUID(user_id_hash, network->guid(), &onc_source);
 
   scoped_ptr<base::DictionaryValue> onc_dictionary =
-      TranslateShillServiceToONCPart(shill_dictionary, onc_source,
+      TranslateShillServiceToONCPart(*shill_dictionary, onc_source,
                                      &onc::kNetworkWithStateSignature);
   return onc_dictionary.Pass();
 }
 
 scoped_ptr<base::ListValue> TranslateNetworkListToONC(
     NetworkTypePattern pattern,
     bool configured_only,
     bool visible_only,
     int limit,
     bool debugging_properties) {
@@ skipping 29 matching lines @@
 std::string TranslateShillTypeToONC(const std::string& shill_type) {
   if (shill_type == shill::kTypeEthernet)
     return ::onc::network_type::kEthernet;
   std::string onc_type;
   onc::TranslateStringToONC(onc::kNetworkTypeTable, shill_type, &onc_type);
   return onc_type;
 }
 
 }  // namespace network_util
 }  // namespace chromeos