Add 'setProperties' to InternetOptionsHandler

chromeos/network/onc/onc_translator_onc_to_shill.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.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
@@ skipping 200 matching lines @@
 
   // SaveCredentials needs special handling when translating from Shill -> ONC
   // so handle it explicitly here.
   CopyFieldFromONCToShill(::onc::vpn::kSaveCredentials,
                           shill::kSaveCredentialsProperty);
 }
 
 void LocalTranslator::TranslateVPN() {
   CopyFieldFromONCToShill(::onc::vpn::kHost, shill::kProviderHostProperty);
   std::string type;
-  onc_object_->GetStringWithoutPathExpansion(::onc::vpn::kType, &type);
-  TranslateWithTableAndSet(type, kVPNTypeTable, shill::kProviderTypeProperty);
+  if (onc_object_->GetStringWithoutPathExpansion(::onc::vpn::kType, &type))
+    TranslateWithTableAndSet(type, kVPNTypeTable, shill::kProviderTypeProperty);
 
   CopyFieldsAccordingToSignature();
 }
 
 void LocalTranslator::TranslateWiFi() {
   std::string security;
   onc_object_->GetStringWithoutPathExpansion(::onc::wifi::kSecurity, &security);
   TranslateWithTableAndSet(security, kWiFiSecurityTable,
                            shill::kSecurityProperty);
 
   std::string ssid;
   onc_object_->GetStringWithoutPathExpansion(::onc::wifi::kSSID, &ssid);
-  shill_property_util::SetSSID(ssid, shill_dictionary_);
+  if (!ssid.empty())
+    shill_property_util::SetSSID(ssid, shill_dictionary_);
 
   // We currently only support managed and no adhoc networks.
   shill_dictionary_->SetStringWithoutPathExpansion(shill::kModeProperty,
                                                    shill::kModeManaged);
 
   bool allow_gateway_arp_polling;
   if (onc_object_->GetBooleanWithoutPathExpansion(
           ::onc::wifi::kAllowGatewayARPPolling, &allow_gateway_arp_polling)) {
     shill_dictionary_->SetBooleanWithoutPathExpansion(
         shill::kLinkMonitorDisableProperty, !allow_gateway_arp_polling);
@@ skipping 155 matching lines @@
     const OncValueSignature* onc_signature,
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   scoped_ptr<base::DictionaryValue> shill_dictionary(new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos