Extend vpnProvider API to support future enhancements

extensions/browser/api/vpn_provider/vpn_provider_api.cc

 // Copyright 2014 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 "extensions/browser/api/vpn_provider/vpn_provider_api.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 132 matching lines @@
 
 }  // namespace
 
 VpnThreadExtensionFunction::~VpnThreadExtensionFunction() {
 }
 
 void VpnThreadExtensionFunction::SignalCallCompletionSuccess() {
   Respond(NoArguments());
 }
 
+void VpnThreadExtensionFunction::SignalCallCompletionSuccessWithId(
+    const std::string& configuration_id) {
+  Respond(OneArgument(new base::StringValue(configuration_id)));
+}
+
 void VpnThreadExtensionFunction::SignalCallCompletionFailure(
     const std::string& error_name,
     const std::string& error_message) {
   if (!error_name.empty() && !error_message.empty()) {
     Respond(Error(error_name + ": " + error_message));
   } else if (!error_name.empty()) {
     Respond(Error(error_name));
   } else {
     Respond(Error(error_message));
   }
 }
 
 VpnProviderCreateConfigFunction::~VpnProviderCreateConfigFunction() {
 }
 
 ExtensionFunction::ResponseAction VpnProviderCreateConfigFunction::Run() {
   scoped_ptr<api_vpn::CreateConfig::Params> params(
       api_vpn::CreateConfig::Params::Create(*args_));
   if (!params) {
     return RespondNow(Error("Invalid arguments."));
   }
 
   chromeos::VpnService* service =
       chromeos::VpnServiceFactory::GetForBrowserContext(browser_context());
   if (!service) {
     return RespondNow(Error("Invalid profile."));
   }
 
+  // Use the configuration name as ID. In the future, a different ID scheme may
+  // be used, requiring a mapping between the two.
   service->CreateConfiguration(
       extension_id(), extension()->name(), params->name,
-      base::Bind(&VpnProviderCreateConfigFunction::SignalCallCompletionSuccess,
-                 this),
+      base::Bind(
+          &VpnProviderCreateConfigFunction::SignalCallCompletionSuccessWithId,
+          this, params->name),
       base::Bind(&VpnProviderNotifyConnectionStateChangedFunction::
                      SignalCallCompletionFailure,
                  this));
 
   return RespondLater();
 }
 
 VpnProviderDestroyConfigFunction::~VpnProviderDestroyConfigFunction() {
 }
 
 ExtensionFunction::ResponseAction VpnProviderDestroyConfigFunction::Run() {
   scoped_ptr<api_vpn::DestroyConfig::Params> params(
       api_vpn::DestroyConfig::Params::Create(*args_));
   if (!params) {
     return RespondNow(Error("Invalid arguments."));
   }
 
   chromeos::VpnService* service =
       chromeos::VpnServiceFactory::GetForBrowserContext(browser_context());
   if (!service) {
     return RespondNow(Error("Invalid profile."));
   }
 
   service->DestroyConfiguration(
-      extension_id(), params->name,
+      extension_id(), params->id,
       base::Bind(&VpnProviderDestroyConfigFunction::SignalCallCompletionSuccess,
                  this),
       base::Bind(&VpnProviderNotifyConnectionStateChangedFunction::
                      SignalCallCompletionFailure,
                  this));
 
   return RespondLater();
 }
 
 VpnProviderSetParametersFunction::~VpnProviderSetParametersFunction() {
@@ skipping 81 matching lines @@
                      SignalCallCompletionSuccess,
                  this),
       base::Bind(&VpnProviderNotifyConnectionStateChangedFunction::
                      SignalCallCompletionFailure,
                  this));
 
   return RespondLater();
 }
 
 }  // namespace extensions