Only import certificates with Web trust from ONC if the user is managed and matches the enterprise …

chrome/browser/policy/network_configuration_updater_unittest.cc

Index: chrome/browser/policy/network_configuration_updater_unittest.cc
diff --git a/chrome/browser/policy/network_configuration_updater_unittest.cc b/chrome/browser/policy/network_configuration_updater_unittest.cc
index a61a1c2f48099721f6d86737344aab47305e804b..8d54a1b95a39de575fcf597c90c5cee83e94b571 100644
--- a/chrome/browser/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/policy/network_configuration_updater_unittest.cc
@@ -6,6 +6,8 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
+#include "chrome/browser/chromeos/login/mock_user_manager.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service_impl.h"
@@ -25,7 +27,7 @@ class NetworkConfigurationUpdaterTest
     : public testing::TestWithParam<const char*> {
  protected:
   virtual void SetUp() OVERRIDE {
-    EXPECT_CALL(network_library_, LoadOncNetworks(_, "", _, _))
+    EXPECT_CALL(network_library_, LoadOncNetworks(_, "", _, _, _))
         .WillRepeatedly(Return(true));
     EXPECT_CALL(provider_, IsInitializationComplete())
         .WillRepeatedly(Return(true));
@@ -44,7 +46,9 @@ class NetworkConfigurationUpdaterTest
     return chromeos::NetworkUIData::ONC_SOURCE_NONE;
   }
 
+  BrowserPolicyConnector connector_;
   chromeos::MockNetworkLibrary network_library_;
+  chromeos::MockUserManager user_manager_;
   MockConfigurationPolicyProvider provider_;
   scoped_ptr<PolicyServiceImpl> policy_service_;
 };
@@ -56,19 +60,25 @@ TEST_P(NetworkConfigurationUpdaterTest, InitialUpdate) {
   provider_.UpdateChromePolicy(policy);
 
   EXPECT_CALL(network_library_,
-              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _))
+              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _, _))
       .WillOnce(Return(true));
 
-  NetworkConfigurationUpdater updater(policy_service_.get(), &network_library_);
+  NetworkConfigurationUpdater updater(policy_service_.get(),
+                                      &connector_,
+                                      &network_library_,
+                                      &user_manager_);
   Mock::VerifyAndClearExpectations(&network_library_);
 }
 
 TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
-  NetworkConfigurationUpdater updater(policy_service_.get(), &network_library_);
+  NetworkConfigurationUpdater updater(policy_service_.get(),
+                                      &connector_,
+                                      &network_library_,
+                                      &user_manager_);
 
   // We should update if policy changes.
   EXPECT_CALL(network_library_,
-              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _))
+              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _, _))
       .WillOnce(Return(true));
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ -78,7 +88,7 @@ TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
 
   // No update if the set the same value again.
   EXPECT_CALL(network_library_,
-              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _))
+              LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _, _))
       .Times(0);
   provider_.UpdateChromePolicy(policy);
   Mock::VerifyAndClearExpectations(&network_library_);
@@ -86,7 +96,7 @@ TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
   // Another update is expected if the policy goes away.
   EXPECT_CALL(network_library_,
               LoadOncNetworks(NetworkConfigurationUpdater::kEmptyConfiguration,
-                              "", NameToONCSource(GetParam()), _))
+                              "", NameToONCSource(GetParam()), _, _))
       .WillOnce(Return(true));
   policy.Erase(GetParam());
   provider_.UpdateChromePolicy(policy);