| Index: chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
|
| diff --git a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
|
| index ec5907ab6e5bfb4a3d8cec1311bda5b6abe05a33..f7fa765cc9e044fc2b35814154177a997a7ad3f0 100644
|
| --- a/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
|
| +++ b/chrome/browser/chromeos/cros/onc_network_parser_unittest.cc
|
| @@ -259,7 +259,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifi1) {
|
| " }"
|
| " }]"
|
| "}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetNetworkConfigsSize());
|
| EXPECT_EQ(0, parser.GetCertificatesSize());
|
| @@ -295,7 +295,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP1) {
|
| " }"
|
| " }]"
|
| "}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetNetworkConfigsSize());
|
| EXPECT_EQ(0, parser.GetCertificatesSize());
|
| @@ -335,7 +335,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkWifiEAP2) {
|
| " }"
|
| " }]"
|
| "}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetNetworkConfigsSize());
|
| EXPECT_EQ(0, parser.GetCertificatesSize());
|
| @@ -364,7 +364,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkOpenVPN) {
|
| " \"NetworkConfigurations\": [") +
|
| std::string(kNetworkConfigurationOpenVPN) + std::string(
|
| " ]}"));
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetNetworkConfigsSize());
|
| EXPECT_EQ(0, parser.GetCertificatesSize());
|
| @@ -443,7 +443,7 @@ TEST_F(OncNetworkParserTest, TestCreateNetworkL2TPIPsec) {
|
| " ],"
|
| " \"Certificates\": []"
|
| "}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetNetworkConfigsSize());
|
| EXPECT_EQ(0, parser.GetCertificatesSize());
|
| @@ -509,7 +509,7 @@ TEST_F(OncNetworkParserTest, TestAddClientCertificate) {
|
| " ],"
|
| "}");
|
| std::string test_guid("{f998f760-272b-6939-4c2beffe428697ac}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
| ASSERT_EQ(1, parser.GetCertificatesSize());
|
|
|
| scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
|
| @@ -579,7 +579,7 @@ TEST_F(OncNetworkParserTest, TestAddServerCertificate) {
|
| " ],"
|
| "}");
|
| std::string test_guid("{f998f760-272b-6939-4c2beffe428697aa}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
| ASSERT_EQ(1, parser.GetCertificatesSize());
|
|
|
| scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
|
| @@ -610,7 +610,7 @@ TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) {
|
| " ],"
|
| "}"));
|
| std::string test_guid("{f998f760-272b-6939-4c2beffe428697ab}");
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
| ASSERT_EQ(1, parser.GetCertificatesSize());
|
|
|
| scoped_refptr<net::X509Certificate> cert = parser.ParseCertificate(0).get();
|
| @@ -631,7 +631,6 @@ TEST_F(OncNetworkParserTest, TestAddAuthorityCertificate) {
|
| SECKEYPublicKeyList* pubkey_list =
|
| PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL);
|
| EXPECT_FALSE(pubkey_list);
|
| -
|
| }
|
|
|
| TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) {
|
| @@ -644,7 +643,7 @@ TEST_F(OncNetworkParserTest, TestNetworkAndCertificate) {
|
| std::string(kCertificateWebAuthority) + std::string(
|
| " ],"
|
| "}"));
|
| - OncNetworkParser parser(test_blob);
|
| + OncNetworkParser parser(test_blob, NetworkUIData::ONC_SOURCE_USER_IMPORT);
|
|
|
| EXPECT_EQ(1, parser.GetCertificatesSize());
|
| EXPECT_TRUE(parser.ParseCertificate(0));
|
|
|