commit 79349f031df30747ae7a1271f80724036ba3e961
author Darin Petkov <petkov@chromium.org> Thu Jan 24 16:18:26 2013 +0100
committer ChromeBot <chrome-bot@google.com> Fri Jan 25 08:43:19 2013 -0800
tree 1b0037a610c2cfef5171dd287277df4d0791ade8
parent 9abd6749e69712e9ec4ed4a54fbba243f16ae7f3

shill: vpn: Don't auto-connect to a VPN service that has never connected.

This improves the chances that the VPN service is connectable.

BUG=chromium-os:38193
TEST=unit test

Change-Id: I5d505604aaa3fd30cb89c2a87de398544d5a1c27
Reviewed-on: https://gerrit.chromium.org/gerrit/41927
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Philipp Neubeck <pneubeck@chromium.org>
Tested-by: Philipp Neubeck <pneubeck@chromium.org>
Commit-Queue: Darin Petkov <petkov@chromium.org>

vpn_service.h

diff --git a/vpn_service.h b/vpn_service.h
index 1162e57..4a6bc9b 100644
--- a/vpn_service.h
+++ b/vpn_service.h
@@ -43,10 +43,17 @@
                                              Error *error);
   void set_storage_id(const std::string &id) { storage_id_ = id; }
 
+ protected:
+  // Inherited from Service.
+  virtual bool IsAutoConnectable(const char **reason) const;
+
  private:
   FRIEND_TEST(VPNServiceTest, GetDeviceRpcId);
+  FRIEND_TEST(VPNServiceTest, IsAutoConnectable);
   FRIEND_TEST(VPNServiceTest, SetConnection);
 
+  static const char kAutoConnNeverConnected[];
+
   virtual std::string GetDeviceRpcId(Error *error);
 
   std::string storage_id_;