shill: vpn: Cleanup VPN service disconnect and destruction process.

BUG=chromium-os:28078
TEST=tested on device

Change-Id: Iafccdd28a6b032d088f7b1e4930f3a7bf700626f
Reviewed-on: https://gerrit.chromium.org/gerrit/18528
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>
diff --git a/openvpn_driver.h b/openvpn_driver.h
index e6598c4..86b1899 100644
--- a/openvpn_driver.h
+++ b/openvpn_driver.h
@@ -17,6 +17,7 @@
 #include "shill/key_value_store.h"
 #include "shill/refptr_types.h"
 #include "shill/rpc_task.h"
+#include "shill/service.h"
 #include "shill/vpn_driver.h"
 
 namespace shill {
@@ -110,7 +111,7 @@
   bool PinHostRoute(const IPConfig::Properties &properties);
 
   bool SpawnOpenVPN();
-  void Cleanup();
+  void Cleanup(Service::ConnectState state);
 
   // Called when the openpvn process exits.
   static void OnOpenVPNDied(GPid pid, gint status, gpointer data);