Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2870)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trust update. Add a utils test. Remove X509 dependency from Shill parsing. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc ('K') | « chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
index b62bca779356d12add3af6a55841c0638ddb4bf4..58a8069e9cbc4a94c97ecb5c651e4315d8f08982 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_impl_cros_unittest.cc
@@ -172,10 +172,10 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) {
EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
// Ignore the device policy update.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _));
+ EXPECT_CALL(network_library_, LoadOncNetworks(_, _, _));
StrictMock<chromeos::MockCertificateHandler>* certificate_handler =
new StrictMock<chromeos::MockCertificateHandler>();
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _));
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _, _));
NetworkConfigurationUpdaterImplCros updater(
policy_service_.get(),
@@ -187,11 +187,12 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) {
// After the user policy is initialized, we always push both policies to the
// NetworkLibrary. Ignore the device policy.
EXPECT_CALL(network_library_, LoadOncNetworks(
- _, onc::ONC_SOURCE_DEVICE_POLICY));
+ _, onc::ONC_SOURCE_DEVICE_POLICY, _));
EXPECT_CALL(network_library_, LoadOncNetworks(
IsEqualTo(network_configs_repaired),
- onc::ONC_SOURCE_USER_POLICY));
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _)).Times(2);
+ onc::ONC_SOURCE_USER_POLICY,
+ _));
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _, _)).Times(2);
EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
@@ -231,11 +232,11 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
}
EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY));
+ IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY, _));
StrictMock<chromeos::MockCertificateHandler>* certificate_handler =
new StrictMock<chromeos::MockCertificateHandler>();
EXPECT_CALL(*certificate_handler, ImportCertificates(
- IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _));
+ IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _, _));
NetworkConfigurationUpdaterImplCros updater(
policy_service_.get(),
@@ -247,14 +248,14 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
// After the user policy is initialized, we always push both policies to the
// NetworkLibrary.
EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY));
+ IsEqualTo(device_networks), onc::ONC_SOURCE_DEVICE_POLICY, _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
- IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _));
+ IsEqualTo(device_certs), onc::ONC_SOURCE_DEVICE_POLICY, _, _));
EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(user_networks), onc::ONC_SOURCE_USER_POLICY));
+ IsEqualTo(user_networks), onc::ONC_SOURCE_USER_POLICY, _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
- IsEqualTo(user_certs), onc::ONC_SOURCE_USER_POLICY, _));
+ IsEqualTo(user_certs), onc::ONC_SOURCE_USER_POLICY, _, _));
EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
@@ -276,10 +277,10 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
net::X509Certificate::FORMAT_AUTO);
ASSERT_EQ(1u, cert_list.size());
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _)).Times(AnyNumber());
+ EXPECT_CALL(network_library_, LoadOncNetworks(_, _, _)).Times(AnyNumber());
StrictMock<chromeos::MockCertificateHandler>* certificate_handler =
new StrictMock<chromeos::MockCertificateHandler>();
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _))
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _, _))
.WillRepeatedly(SetCertificateList(empty_cert_list));
NetworkConfigurationUpdaterImplCros updater(
policy_service_.get(),
@@ -301,12 +302,12 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam,
// Certificates with the "Web" trust flag set should be forwarded to the
// trust provider.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _));
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _))
+ EXPECT_CALL(network_library_, LoadOncNetworks(_, _, _));
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _, _))
.WillRepeatedly(SetCertificateList(empty_cert_list));
onc::ONCSource current_source = NameToONCSource(GetParam());
- EXPECT_CALL(network_library_, LoadOncNetworks(_, current_source));
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, current_source, _))
+ EXPECT_CALL(network_library_, LoadOncNetworks(_, current_source, _));
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, current_source, _, _))
.WillRepeatedly(SetCertificateList(cert_list));
// Trigger a new policy load, and spin the IO message loop to pass the
// certificates to the |trust_provider| on the IO thread.
@@ -332,11 +333,11 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
EXPECT_CALL(network_library_, AddNetworkProfileObserver(_));
// Ignore the initial updates.
- EXPECT_CALL(network_library_, LoadOncNetworks(_, _))
+ EXPECT_CALL(network_library_, LoadOncNetworks(_, _, _))
.Times(AnyNumber());
StrictMock<chromeos::MockCertificateHandler>* certificate_handler =
new StrictMock<chromeos::MockCertificateHandler>();
- EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _))
+ EXPECT_CALL(*certificate_handler, ImportCertificates(_, _, _, _))
.Times(AnyNumber());
NetworkConfigurationUpdaterImplCros updater(
policy_service_.get(),
@@ -348,18 +349,19 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
// We should update if policy changes.
EXPECT_CALL(network_library_, LoadOncNetworks(
- IsEqualTo(fake_network_configs_.get()), NameToONCSource(GetParam())));
+ IsEqualTo(fake_network_configs_.get()), NameToONCSource(GetParam()), _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
- IsEqualTo(fake_certificates_.get()), NameToONCSource(GetParam()), _));
+ IsEqualTo(fake_certificates_.get()), NameToONCSource(GetParam()), _, _));
// In the current implementation, we always apply both policies.
EXPECT_CALL(network_library_, LoadOncNetworks(
IsEqualTo(empty_network_configs_.get()),
- Ne(NameToONCSource(GetParam()))));
+ Ne(NameToONCSource(GetParam())),
+ _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
IsEqualTo(empty_certificates_.get()),
Ne(NameToONCSource(GetParam())),
- _));
+ _, _));
PolicyMap policy;
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ -372,19 +374,21 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) {
// implementation, we always apply both policies.
EXPECT_CALL(network_library_, LoadOncNetworks(
IsEqualTo(empty_network_configs_.get()),
- onc::ONC_SOURCE_DEVICE_POLICY));
+ onc::ONC_SOURCE_DEVICE_POLICY,
+ _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
IsEqualTo(empty_certificates_.get()),
onc::ONC_SOURCE_DEVICE_POLICY,
- _));
+ _, _));
EXPECT_CALL(network_library_, LoadOncNetworks(
IsEqualTo(empty_network_configs_.get()),
- onc::ONC_SOURCE_USER_POLICY));
+ onc::ONC_SOURCE_USER_POLICY,
+ _));
EXPECT_CALL(*certificate_handler, ImportCertificates(
IsEqualTo(empty_certificates_.get()),
onc::ONC_SOURCE_USER_POLICY,
- _));
+ _, _));
EXPECT_CALL(network_library_, RemoveNetworkProfileObserver(_));
« chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc ('K') | « chrome/browser/chromeos/policy/network_configuration_updater_impl_cros.cc ('k') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('j') | chrome/browser/ui/webui/net_internals/net_internals_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698