Add an ONC property for the third-party VPN provider extension ID

chromeos/network/network_state_unittest.cc

 // Copyright (c) 2013 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 "chromeos/network/network_state.h"
 
 #include "base/basictypes.h"
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 36 matching lines @@
  private:
   std::string value_;
 };
 
 class NetworkStateTest : public testing::Test {
  public:
   NetworkStateTest() : network_state_("test_path") {
   }
 
  protected:
+  bool SetProperty(const std::string& key, scoped_ptr<base::Value> value) {
+    const bool result = network_state_.PropertyChanged(key, *value);
+    properties_.SetWithoutPathExpansion(key, value.release());
+    return result;
+  }
+
   bool SetStringProperty(const std::string& key, const std::string& value) {
-    TestStringValue* string_value = new TestStringValue(value);
-    bool res = network_state_.PropertyChanged(key, *string_value);
-    properties_.SetWithoutPathExpansion(key, string_value);
-    return res;
+    return SetProperty(key, make_scoped_ptr(new TestStringValue(value)));
   }
 
   bool SignalInitialPropertiesReceived() {
     return network_state_.InitialPropertiesReceived(properties_);
   }
 
   NetworkState network_state_;
 
  private:
   base::DictionaryValue properties_;
@@ skipping 134 matching lines @@
   EXPECT_FALSE(network_state_.is_captive_portal());
 
   // Set the status property to the expected captive portal state property.
   // is_captive_portal should now be true.
   SetStringProperty(shill::kPortalDetectionFailedStatusProperty,
                     shill::kPortalDetectionStatusFailure);
   SignalInitialPropertiesReceived();
   EXPECT_TRUE(network_state_.is_captive_portal());
 }
 
+// Third-party VPN provider.
+TEST_F(NetworkStateTest, VPNThirdPartyProvider) {
+  EXPECT_TRUE(SetStringProperty(shill::kTypeProperty, shill::kTypeVPN));
+  EXPECT_TRUE(SetStringProperty(shill::kNameProperty, "VPN"));
+
+  scoped_ptr<base::DictionaryValue> provider(new base::DictionaryValue);
+  provider->SetStringWithoutPathExpansion(shill::kTypeProperty,
+                                          shill::kProviderThirdPartyVpn);
+  provider->SetStringWithoutPathExpansion(
+      shill::kHostProperty, "third-party-vpn-provider-extension-id");
+  EXPECT_TRUE(SetProperty(shill::kProviderProperty, provider.Pass()));
+  SignalInitialPropertiesReceived();
+  EXPECT_EQ(network_state_.vpn_provider_type(), shill::kProviderThirdPartyVpn);
+  EXPECT_EQ(network_state_.third_party_vpn_provider_extension_id(),
+            "third-party-vpn-provider-extension-id");
+}
+
 }  // namespace chromeos