Convert TrayVPN to use new NetworkState code

chromeos/dbus/shill_service_client_stub.cc

Index: chromeos/dbus/shill_service_client_stub.cc
diff --git a/chromeos/dbus/shill_service_client_stub.cc b/chromeos/dbus/shill_service_client_stub.cc
index 86e637b196e44496dbc0f9b1339b4f7b027afd81..82686195d711af95d7524916053a79ec76c7f11b 100644
--- a/chromeos/dbus/shill_service_client_stub.cc
+++ b/chromeos/dbus/shill_service_client_stub.cc
@@ -291,6 +291,9 @@ const base::DictionaryValue* ShillServiceClientStub::GetServiceProperties(
 }
 
 void ShillServiceClientStub::ClearServices() {
+  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+      ClearServices();
+
   stub_services_.Clear();
 }
 
@@ -335,6 +338,16 @@ void ShillServiceClientStub::SetDefaultProperties() {
   SetServiceProperty("stub_cellular1",
                      flimflam::kActivationStateProperty,
                      activation_value);
+
+  AddService("stub_vpn1", "vpn1",
+             flimflam::kTypeVPN,
+             flimflam::kStateOnline,
+             add_to_watchlist);
+
+  AddService("stub_vpn2", "vpn2",
+             flimflam::kTypeVPN,
+             flimflam::kStateOffline,
+             add_to_watchlist);
 }
 
 void ShillServiceClientStub::PassStubServiceProperties(