Index: chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
index 0d508ede690f61887146f28400517aab45c27f10..3edf673891c5d59bce8b8c4f2356900b26d584df 100644 |
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
@@ -14,7 +14,6 @@ |
#include "chrome/browser/chromeos/settings/cros_settings.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
#include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h" |
-#include "chrome/test/base/testing_profile.h" |
#include "chromeos/network/fake_network_device_handler.h" |
#include "chromeos/network/mock_managed_network_configuration_handler.h" |
#include "chromeos/network/onc/onc_certificate_importer.h" |
@@ -254,20 +253,14 @@ class NetworkConfigurationUpdaterTest : public testing::Test { |
UserNetworkConfigurationUpdater* |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- bool allow_trusted_certs_from_policy, |
- bool set_cert_importer) { |
+ bool allow_trusted_certs_from_policy) { |
UserNetworkConfigurationUpdater* updater = |
UserNetworkConfigurationUpdater::CreateForUserPolicy( |
- &profile_, |
allow_trusted_certs_from_policy, |
fake_user_, |
policy_service_.get(), |
+ certificate_importer_owned_.Pass(), |
&network_config_handler_).release(); |
- if (set_cert_importer) { |
- EXPECT_TRUE(certificate_importer_owned_); |
- updater->SetCertificateImporterForTest( |
- certificate_importer_owned_.Pass()); |
- } |
network_configuration_updater_.reset(updater); |
return updater; |
} |
@@ -292,10 +285,6 @@ class NetworkConfigurationUpdaterTest : public testing::Test { |
chromeos::ScopedTestDeviceSettingsService scoped_device_settings_service_; |
chromeos::ScopedTestCrosSettings scoped_cros_settings_; |
- // Ownership of certificate_importer_owned_ is passed to the |
- // NetworkConfigurationUpdater. When that happens, |certificate_importer_| |
- // continues to point to that instance but |certificate_importer_owned_| is |
- // released. |
FakeCertificateImporter* certificate_importer_; |
scoped_ptr<chromeos::onc::CertificateImporter> certificate_importer_owned_; |
@@ -303,8 +292,6 @@ class NetworkConfigurationUpdaterTest : public testing::Test { |
scoped_ptr<PolicyServiceImpl> policy_service_; |
FakeUser fake_user_; |
- TestingProfile profile_; |
- |
scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; |
content::TestBrowserThreadBundle thread_bundle_; |
}; |
@@ -372,8 +359,7 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) { |
certificate_importer_->SetExpectedONCSource(onc::ONC_SOURCE_USER_POLICY); |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- false /* do not allow trusted certs from policy */, |
- true /* set certificate importer */); |
+ false /* do not allow trusted certs from policy */); |
MarkPolicyProviderInitialized(); |
EXPECT_EQ(1u, certificate_importer_->GetAndResetImportCount()); |
} |
@@ -393,8 +379,7 @@ TEST_F(NetworkConfigurationUpdaterTest, |
UserNetworkConfigurationUpdater* updater = |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- false /* do not allow trusted certs from policy */, |
- true /* set certificate importer */); |
+ false /* do not allow trusted certs from policy */); |
MarkPolicyProviderInitialized(); |
// Certificates with the "Web" trust flag set should not be forwarded to |
@@ -430,8 +415,7 @@ TEST_F(NetworkConfigurationUpdaterTest, |
UserNetworkConfigurationUpdater* updater = |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- true /* allow trusted certs from policy */, |
- true /* set certificate importer */); |
+ true /* allow trusted certs from policy */); |
MarkPolicyProviderInitialized(); |
base::RunLoop().RunUntilIdle(); |
@@ -451,8 +435,7 @@ TEST_F(NetworkConfigurationUpdaterTest, |
// Start with an empty certificate list. |
UserNetworkConfigurationUpdater* updater = |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- true /* allow trusted certs from policy */, |
- true /* set certificate importer */); |
+ true /* allow trusted certs from policy */); |
MarkPolicyProviderInitialized(); |
FakeWebTrustedCertsObserver observer; |
@@ -500,36 +483,6 @@ TEST_F(NetworkConfigurationUpdaterTest, |
updater->RemoveTrustedCertsObserver(&observer); |
} |
-TEST_F(NetworkConfigurationUpdaterTest, |
- DontImportCertificateBeforeCertificateImporterSet) { |
- PolicyMap policy; |
- policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_USER, new base::StringValue(kFakeONC), NULL); |
- UpdateProviderPolicy(policy); |
- |
- EXPECT_CALL(network_config_handler_, |
- SetPolicy(onc::ONC_SOURCE_USER_POLICY, |
- kFakeUsernameHash, |
- IsEqualTo(&fake_network_configs_), |
- IsEqualTo(&fake_global_network_config_))); |
- |
- UserNetworkConfigurationUpdater* updater = |
- CreateNetworkConfigurationUpdaterForUserPolicy( |
- true /* allow trusted certs from policy */, |
- false /* do not set certificate importer */); |
- MarkPolicyProviderInitialized(); |
- |
- Mock::VerifyAndClearExpectations(&network_config_handler_); |
- EXPECT_EQ(0u, certificate_importer_->GetAndResetImportCount()); |
- |
- certificate_importer_->SetExpectedONCCertificates(fake_certificates_); |
- certificate_importer_->SetExpectedONCSource(onc::ONC_SOURCE_USER_POLICY); |
- |
- ASSERT_TRUE(certificate_importer_owned_); |
- updater->SetCertificateImporterForTest(certificate_importer_owned_.Pass()); |
- EXPECT_EQ(1u, certificate_importer_->GetAndResetImportCount()); |
-} |
- |
class NetworkConfigurationUpdaterTestWithParam |
: public NetworkConfigurationUpdaterTest, |
public testing::WithParamInterface<const char*> { |
@@ -559,8 +512,7 @@ class NetworkConfigurationUpdaterTestWithParam |
void CreateNetworkConfigurationUpdater() { |
if (GetParam() == key::kOpenNetworkConfiguration) { |
CreateNetworkConfigurationUpdaterForUserPolicy( |
- false /* do not allow trusted certs from policy */, |
- true /* set certificate importer */); |
+ false /* do not allow trusted certs from policy */); |
} else { |
CreateNetworkConfigurationUpdaterForDevicePolicy(); |
} |