Repair adding of custom VPNs.

Revision r180998 introduced this bug: User cannot add custom VPNs.

This removes the validation check in the ConfigureService* functions of the
ShillManagerClient, which are redundant because Shill checks the properties anyways.

BUG=234339

Review URL: https://chromiumcodereview.appspot.com/14641005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197468 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 45 deletions

diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc
index c5f05ff..0a77450 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -22,43 +22,6 @@ namespace chromeos {
 
 namespace {
 
-const char kIncompleteServiceProperties[] = "Error.IncompleteServiceProperties";
-const char kIncompleteServicePropertiesMessage[] =
-    "Service properties are incomplete.";
-
-// Returns whether the properties have the required keys or not.
-bool AreServicePropertiesValidWithMode(
-    const base::DictionaryValue& properties,
-    const ShillManagerClient::ErrorCallback& error_callback) {
-  if (properties.HasKey(flimflam::kGuidProperty) ||
-      (properties.HasKey(flimflam::kTypeProperty) &&
-       properties.HasKey(flimflam::kSecurityProperty) &&
-       properties.HasKey(flimflam::kModeProperty) &&
-       properties.HasKey(flimflam::kSSIDProperty))) {
-    return true;
-  }
-  error_callback.Run(kIncompleteServiceProperties,
-                     kIncompleteServicePropertiesMessage);
-  return false;
-}
-
-// DEPRECATED: Keep this only for backward compatibility with NetworkLibrary.
-// Returns whether the properties have the required keys or not.
-// TODO(pneubeck): remove this once NetworkLibrary is gone (crbug/230799).
-bool AreServicePropertiesValid(
-    const base::DictionaryValue& properties,
-    const ShillManagerClient::ErrorCallback& error_callback) {
-  if (properties.HasKey(flimflam::kGuidProperty) ||
-      (properties.HasKey(flimflam::kTypeProperty) &&
-       properties.HasKey(flimflam::kSecurityProperty) &&
-       properties.HasKey(flimflam::kSSIDProperty))) {
-    return true;
-  }
-  error_callback.Run(kIncompleteServiceProperties,
-                     kIncompleteServicePropertiesMessage);
-  return false;
-}
-
 // Appends a string-to-variant dictionary to the writer.
 void AppendServicePropertiesDictionary(
     dbus::MessageWriter* writer,
@@ -175,10 +138,6 @@ class ShillManagerClientImpl : public ShillManagerClient {
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
-    if (!AreServicePropertiesValid(properties, error_callback)) {
-      NOTREACHED() << kIncompleteServicePropertiesMessage;
-      return;
-    }
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  flimflam::kConfigureServiceFunction);
     dbus::MessageWriter writer(&method_call);
@@ -193,10 +152,6 @@ class ShillManagerClientImpl : public ShillManagerClient {
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE {
-    if (!AreServicePropertiesValidWithMode(properties, error_callback)) {
-      NOTREACHED() << kIncompleteServicePropertiesMessage;
-      return;
-    }
     dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface,
                                  shill::kConfigureServiceForProfileFunction);
     dbus::MessageWriter writer(&method_call);