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 326 matching lines @@
   if (!ipconfig_path.empty()) {
     properties->SetWithoutPathExpansion(
         shill::kIPConfigProperty,
         new base::StringValue(ipconfig_path));
   }
 
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       AddManagerService(service_path, true);
 }
 
-
 base::DictionaryValue* FakeShillServiceClient::SetServiceProperties(
     const std::string& service_path,
     const std::string& guid,
     const std::string& name,
     const std::string& type,
     const std::string& state,
     bool visible) {
   base::DictionaryValue* properties =
       GetModifiableServiceProperties(service_path, true);
   connect_behavior_.erase(service_path);
 
   std::string profile_path;
   base::DictionaryValue profile_properties;
-  if (DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface()->
-      GetService(service_path, &profile_path, &profile_properties)) {
-    properties->SetWithoutPathExpansion(
-        shill::kProfileProperty,
-        new base::StringValue(profile_path));
+  if (DBusThreadManager::Get()
+          ->GetShillProfileClient()
+          ->GetTestInterface()
+          ->GetService(service_path, &profile_path, &profile_properties)) {
+    properties->SetStringWithoutPathExpansion(shill::kProfileProperty,
+                                              profile_path);
   }
 
   // If |guid| is provided, set Service.GUID to that. Otherwise if a GUID is
   // stored in a profile entry, use that. Otherwise leave it blank. Shill does
   // 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);
+    profile_properties.GetStringWithoutPathExpansion(shill::kGuidProperty,
+                                                     &guid_to_set);
   }
   if (!guid_to_set.empty()) {
-    properties->SetWithoutPathExpansion(shill::kGuidProperty,
-                                        new base::StringValue(guid_to_set));
+    properties->SetStringWithoutPathExpansion(shill::kGuidProperty,
+                                              guid_to_set);
   }
-  shill_property_util::SetSSID(name, properties);
-  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(
-      shill::kTypeProperty,
-      new base::StringValue(type));
-  properties->SetWithoutPathExpansion(
-      shill::kStateProperty,
-      new base::StringValue(state));
-  properties->SetWithoutPathExpansion(
-      shill::kVisibleProperty,
-      new base::FundamentalValue(visible));
+  properties->SetStringWithoutPathExpansion(shill::kSSIDProperty, name);
+  shill_property_util::SetSSID(name, properties);  // Sets kWifiHexSsid
+  properties->SetStringWithoutPathExpansion(shill::kNameProperty, name);
+  std::string device_path = DBusThreadManager::Get()
+                                ->GetShillDeviceClient()
+                                ->GetTestInterface()
+                                ->GetDevicePathForType(type);
+  properties->SetStringWithoutPathExpansion(shill::kDeviceProperty,
+                                            device_path);
+  properties->SetStringWithoutPathExpansion(shill::kTypeProperty, type);
+  properties->SetStringWithoutPathExpansion(shill::kStateProperty, state);
+  properties->SetBooleanWithoutPathExpansion(shill::kVisibleProperty, visible);
   if (type == shill::kTypeWifi) {
-    properties->SetWithoutPathExpansion(
-        shill::kSecurityProperty,
-        new base::StringValue(shill::kSecurityNone));
-    properties->SetWithoutPathExpansion(
-        shill::kModeProperty,
-        new base::StringValue(shill::kModeManaged));
+    properties->SetStringWithoutPathExpansion(shill::kSecurityProperty,
+                                              shill::kSecurityNone);
+    properties->SetStringWithoutPathExpansion(shill::kModeProperty,
+                                              shill::kModeManaged);
   }
   return properties;
 }
 
 void FakeShillServiceClient::RemoveService(const std::string& service_path) {
   stub_services_.RemoveWithoutPathExpansion(service_path, NULL);
   connect_behavior_.erase(service_path);
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
       RemoveManagerService(service_path);
 }
 
 bool FakeShillServiceClient::SetServiceProperty(const std::string& service_path,
                                                 const std::string& property,
                                                 const base::Value& value) {
   base::DictionaryValue* dict = NULL;
   if (!stub_services_.GetDictionaryWithoutPathExpansion(service_path, &dict))
     return false;
 
   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