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

Unified Diff: chrome/browser/policy/network_configuration_updater_unittest.cc

Issue 10236003: Added RefreshPolicies to PolicyService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 8 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
« no previous file with comments | « chrome/browser/policy/mock_configuration_policy_provider.cc ('k') | chrome/browser/policy/policy_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1b3f67dd79cf991bdf178f351c7fb4db2663054d..bf6d71bab965d220f5a6cfeaf5266e387a05cac9 100644
--- a/chrome/browser/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/policy/network_configuration_updater_unittest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/chromeos/cros/mock_network_library.h"
#include "chrome/browser/policy/mock_configuration_policy_provider.h"
+#include "chrome/browser/policy/policy_map.h"
#include "policy/policy_constants.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -22,6 +23,8 @@ class NetworkConfigurationUpdaterTest
: public testing::TestWithParam<const char*> {
protected:
virtual void SetUp() OVERRIDE {
+ EXPECT_CALL(provider_, ProvideInternal(_))
+ .WillRepeatedly(CopyPolicyMap(&policy_));
EXPECT_CALL(network_library_, LoadOncNetworks(_, "", _, _))
.WillRepeatedly(Return(true));
}
@@ -37,11 +40,13 @@ class NetworkConfigurationUpdaterTest
}
chromeos::MockNetworkLibrary network_library_;
+ PolicyMap policy_;
MockConfigurationPolicyProvider provider_;
};
TEST_P(NetworkConfigurationUpdaterTest, InitialUpdate) {
- provider_.AddMandatoryPolicy(GetParam(), Value::CreateStringValue(kFakeONC));
+ policy_.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ Value::CreateStringValue(kFakeONC));
EXPECT_CALL(network_library_,
LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _))
@@ -58,7 +63,8 @@ TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
EXPECT_CALL(network_library_,
LoadOncNetworks(kFakeONC, "", NameToONCSource(GetParam()), _))
.WillOnce(Return(true));
- provider_.AddMandatoryPolicy(GetParam(), Value::CreateStringValue(kFakeONC));
+ policy_.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ Value::CreateStringValue(kFakeONC));
provider_.NotifyPolicyUpdated();
Mock::VerifyAndClearExpectations(&network_library_);
@@ -74,7 +80,7 @@ TEST_P(NetworkConfigurationUpdaterTest, PolicyChange) {
LoadOncNetworks(NetworkConfigurationUpdater::kEmptyConfiguration,
"", NameToONCSource(GetParam()), _))
.WillOnce(Return(true));
- provider_.RemovePolicy(GetParam());
+ policy_.Erase(GetParam());
provider_.NotifyPolicyUpdated();
Mock::VerifyAndClearExpectations(&network_library_);
}
« no previous file with comments | « chrome/browser/policy/mock_configuration_policy_provider.cc ('k') | chrome/browser/policy/policy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698