Add 'setProperties' to InternetOptionsHandler

chromeos/dbus/fake_shill_service_client.cc

 // Copyright 2013 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/dbus/fake_shill_service_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 359 matching lines @@
   // not enforce a valid guid, we do that at the NetworkStateHandler layer.
   std::string guid_to_set = guid;
   if (guid_to_set.empty()) {
     profile_properties.GetStringWithoutPathExpansion(
         shill::kGuidProperty, &guid_to_set);
   }
   if (!guid_to_set.empty()) {
     properties->SetWithoutPathExpansion(shill::kGuidProperty,
                                         new base::StringValue(guid_to_set));
   }
-  shill_property_util::SetSSID(name, properties);
+  properties->SetWithoutPathExpansion(

[pneubeck (no reviews), 2014/11/11 16:09:31]

SetStringWithoutPathExpansion would be more compact and doesn't require a 'new'

[stevenjb, 2014/11/12 01:23:29]

This function predates those. Replaced them all.

+      shill::kSSIDProperty,
+      new base::StringValue(name));
+  shill_property_util::SetSSID(name, properties);  // Sets kWifiHexSsid
   properties->SetWithoutPathExpansion(
       shill::kNameProperty,
       new base::StringValue(name));
   std::string device_path =
       DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()->
       GetDevicePathForType(type);
   properties->SetWithoutPathExpansion(
       shill::kDeviceProperty,
       new base::StringValue(device_path));
   properties->SetWithoutPathExpansion(
@@ skipping 33 matching lines @@
   VLOG(1) << "Service.SetProperty: " << property << " = " << value
           << " For: " << service_path;
 
   base::DictionaryValue new_properties;
   std::string changed_property;
   bool case_sensitive = true;
   if (StartsWithASCII(property, "Provider.", case_sensitive) ||
       StartsWithASCII(property, "OpenVPN.", case_sensitive) ||
       StartsWithASCII(property, "L2TPIPsec.", case_sensitive)) {
     // These properties are only nested within the Provider dictionary if read
-    // from Shill.
+    // from Shill. Properties that start with "Provider" need to have that
+    // stripped off, other properties are nested in the "Provider" dictionary
+    // as-is.
+    std::string key = property;
+    if (StartsWithASCII(property, "Provider.", case_sensitive))
+      key = property.substr(strlen("Provider."));
     base::DictionaryValue* provider = new base::DictionaryValue;
-    provider->SetWithoutPathExpansion(property, value.DeepCopy());
+    provider->SetWithoutPathExpansion(key, value.DeepCopy());
     new_properties.SetWithoutPathExpansion(shill::kProviderProperty, provider);
     changed_property = shill::kProviderProperty;
   } else {
     new_properties.SetWithoutPathExpansion(property, value.DeepCopy());
     changed_property = property;
   }
 
   dict->MergeDictionary(&new_properties);
 
   // Add or update the profile entry.
@@ skipping 185 matching lines @@
   } else {
     // Set Online.
     VLOG(1) << "Setting state to Online " << service_path;
     SetServiceProperty(service_path,
                        shill::kStateProperty,
                        base::StringValue(shill::kStateOnline));
   }
 }
 
 }  // namespace chromeos