shill: vpn: Remove support for obsolete Service.Provider.Name.
Chrome doesn't set this property anymore -- it sets Service.Name
instead.
BUG=chromium:221577
TEST=unit tests; tested on device by connecting to a new VPN service
through the UI as well as through connect-vpn, inspectings logs and
profile, checked service name.
Change-Id: I4b9d1a0c1e1619a6c1c71232829780099eb4507a
Reviewed-on: https://gerrit.chromium.org/gerrit/47121
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Commit-Queue: Darin Petkov <petkov@chromium.org>
diff --git a/vpn_provider.cc b/vpn_provider.cc
index be8530e..77f066f 100644
--- a/vpn_provider.cc
+++ b/vpn_provider.cc
@@ -61,10 +61,7 @@
return NULL;
}
- string name = args.LookupString(flimflam::kProviderNameProperty, "");
- if (name.empty()) {
- name = args.LookupString(flimflam::kNameProperty, "");
- }
+ string name = args.LookupString(flimflam::kNameProperty, "");
// Find a service in the provider list which matches these parameters.
VPNServiceRefPtr service = FindService(type, name, host);
@@ -113,10 +110,9 @@
}
string name;
- if (!storage->GetString(*it, flimflam::kProviderNameProperty, &name) &&
- !storage->GetString(*it, flimflam::kNameProperty, &name)) {
+ if (!storage->GetString(*it, flimflam::kNameProperty, &name)) {
LOG(ERROR) << "Group " << *it << " is missing the "
- << flimflam::kProviderNameProperty << " property.";
+ << flimflam::kNameProperty << " property.";
continue;
}