Adding policy support to the new network configuration stack.

chromeos/dbus/shill_manager_client.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/dbus/shill_manager_client.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_manager_client_stub.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 // Returns whether the properties have the required keys or not.
+bool AreServicePropertiesValid2(const base::DictionaryValue& properties) {

[stevenjb, 2013/04/11 18:20:08]

2 is a poor differentiator. Maybe ForProfile or WithMode?

[pneubeck (no reviews), 2013/04/15 12:16:24]

Done.

+  if (properties.HasKey(flimflam::kGuidProperty))
+    return true;
+  return properties.HasKey(flimflam::kTypeProperty) &&
+      properties.HasKey(flimflam::kSecurityProperty) &&
+      properties.HasKey(flimflam::kModeProperty) &&
+      properties.HasKey(flimflam::kSSIDProperty);
+}
+
+// DEPRECATED: Keep this only for backward compatibility with NetworkLibrary.

[pastarmovj, 2013/04/11 14:46:29]

Put a todo here to remove that once not needed and make a bug for that
referenced from the TODO - that way this will not be code rotting here forever.

[pneubeck (no reviews), 2013/04/15 12:16:24]

Done.

+// Returns whether the properties have the required keys or not.
 bool AreServicePropertiesValid(const base::DictionaryValue& properties) {
   if (properties.HasKey(flimflam::kGuidProperty))
     return true;
   return properties.HasKey(flimflam::kTypeProperty) &&
       properties.HasKey(flimflam::kSecurityProperty) &&
       properties.HasKey(flimflam::kSSIDProperty);
 }
 
 // Appends a string-to-variant dictionary to the writer.
 void AppendServicePropertiesDictionary(
@@ skipping 114 matching lines @@
     DCHECK(AreServicePropertiesValid(properties));
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kConfigureServiceFunction);
     dbus::MessageWriter writer(&method_call);
     AppendServicePropertiesDictionary(&writer, properties);
     helper_.CallObjectPathMethodWithErrorCallback(&method_call,
                                                   callback,
                                                   error_callback);
   }
 
+  virtual void ConfigureServiceForProfile(
+      const dbus::ObjectPath& profile_path,
+      const base::DictionaryValue& properties,
+      const ObjectPathCallback& callback,
+      const ErrorCallback& error_callback) OVERRIDE {
+    DCHECK(AreServicePropertiesValid2(properties));

[pastarmovj, 2013/04/11 14:46:29]

DCHECK will only verify in debug builds - does your code below handle this
situation correctly - if not you should either CHECK or exit early here.

[pneubeck (no reviews), 2013/04/15 12:16:24]

Done.

+    dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
+                                 shill::kConfigureServiceForProfileFunction);
+    dbus::MessageWriter writer(&method_call);
+    writer.AppendObjectPath(dbus::ObjectPath(profile_path));
+    AppendServicePropertiesDictionary(&writer, properties);
+    helper_.CallObjectPathMethodWithErrorCallback(&method_call,
+                                                  callback,
+                                                  error_callback);
+  }
+
   virtual void GetService(
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kGetServiceFunction);
     dbus::MessageWriter writer(&method_call);
     AppendServicePropertiesDictionary(&writer, properties);
     helper_.CallObjectPathMethodWithErrorCallback(&method_call,
                                                   callback,
@@ skipping 97 matching lines @@
 ShillManagerClient* ShillManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new ShillManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new ShillManagerClientStub();
 }
 
 }  // namespace chromeos