Use Shill's Manager::ConfigureServiceForProfile for all network types.

chromeos/network/network_configuration_handler.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_configuration_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 261 matching lines @@
     const network_handler::StringResultCallback& callback,
     const network_handler::ErrorCallback& error_callback) {
   ShillManagerClient* manager =
       DBusThreadManager::Get()->GetShillManagerClient();
   std::string type;
   properties.GetStringWithoutPathExpansion(flimflam::kTypeProperty, &type);
 
   NET_LOG_USER("CreateConfiguration", type);
   LogConfigProperties("Configure", type, properties);
 
-  // Shill supports ConfigureServiceForProfile only for network type WiFi. In
-  // all other cases, we have to rely on GetService for now. This is
-  // unproblematic for VPN (user profile only), but will lead to inconsistencies
-  // with WiMax, for example.
-  if (type == flimflam::kTypeWifi) {
-    std::string profile;
-    properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
-                                             &profile);
-    manager->ConfigureServiceForProfile(
-        dbus::ObjectPath(profile),
-        properties,
-        base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
-                   AsWeakPtr(), callback),
-        base::Bind(&network_handler::ShillErrorCallbackFunction,
-                   "Config.CreateConfiguration Failed", "", error_callback));
-  } else {
-    manager->ConfigureService(
-        properties,
-        base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
-                   AsWeakPtr(), callback),
-        base::Bind(&network_handler::ShillErrorCallbackFunction,
-                   "Config.CreateConfiguration Failed", "", error_callback));
-  }
+  std::string profile;
+  properties.GetStringWithoutPathExpansion(flimflam::kProfileProperty,
+                                           &profile);
+  DCHECK(!profile.empty());
+  manager->ConfigureServiceForProfile(
+      dbus::ObjectPath(profile),
+      properties,
+      base::Bind(&NetworkConfigurationHandler::RunCreateNetworkCallback,
+                 AsWeakPtr(),
+                 callback),
+      base::Bind(&network_handler::ShillErrorCallbackFunction,
+                 "Config.CreateConfiguration Failed",
+                 "",
+                 error_callback));
 }
 
 void NetworkConfigurationHandler::RemoveConfiguration(
     const std::string& service_path,
     const base::Closure& callback,
     const network_handler::ErrorCallback& error_callback) {
   // Service.Remove is not reliable. Instead, request the profile entries
   // for the service and remove each entry.
   if (profile_entry_deleters_.count(service_path)) {
     InvokeErrorCallback(
@@ skipping 134 matching lines @@
 
 // static
 NetworkConfigurationHandler* NetworkConfigurationHandler::InitializeForTest(
     NetworkStateHandler* network_state_handler) {
   NetworkConfigurationHandler* handler = new NetworkConfigurationHandler();
   handler->Init(network_state_handler);
   return handler;
 }
 
 }  // namespace chromeos