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

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

Issue 6079012: Allow policy refresh rate to be configured through policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build. Created 9 years, 12 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
Index: chrome/browser/policy/device_management_policy_provider_unittest.cc
diff --git a/chrome/browser/policy/device_management_policy_provider_unittest.cc b/chrome/browser/policy/device_management_policy_provider_unittest.cc
index eac2c5b5516f977833b1ee2cd4e673a0010f8bd2..6159aab0ed2c004ce123fdedf90ef260463d405c 100644
--- a/chrome/browser/policy/device_management_policy_provider_unittest.cc
+++ b/chrome/browser/policy/device_management_policy_provider_unittest.cc
@@ -65,7 +65,8 @@ class DeviceManagementPolicyProviderTest : public testing::Test {
}
void CreateNewProvider(int64 policy_refresh_rate_ms,
- int64 policy_refresh_max_earlier_ms,
+ int policy_refresh_fuzz_factor_percent,
+ int64 policy_refresh_fuzz_max,
int64 policy_refresh_error_delay_ms,
int64 token_fetch_error_delay_ms,
int64 unmanaged_device_refresh_rate_ms) {
@@ -75,7 +76,8 @@ class DeviceManagementPolicyProviderTest : public testing::Test {
backend_,
profile_.get(),
policy_refresh_rate_ms,
- policy_refresh_max_earlier_ms,
+ policy_refresh_fuzz_factor_percent,
+ policy_refresh_fuzz_max,
policy_refresh_error_delay_ms,
token_fetch_error_delay_ms,
unmanaged_device_refresh_rate_ms));
@@ -117,11 +119,12 @@ class DeviceManagementPolicyProviderTest : public testing::Test {
}
virtual void TearDown() {
+ provider_.reset();
loop_.RunAllPending();
}
bool waiting_for_initial_policies() const {
- return provider_->waiting_for_initial_policies_;
+ return !provider_->IsInitializationComplete();
}
MockDeviceManagementBackend* backend_; // weak
@@ -215,7 +218,7 @@ TEST_F(DeviceManagementPolicyProviderTest, FetchTriggersRefresh) {
TEST_F(DeviceManagementPolicyProviderTest, ErrorCausesNewRequest) {
InSequence s;
- CreateNewProvider(1000 * 1000, 0, 0, 0, 0);
+ CreateNewProvider(1000 * 1000, 0, 0, 0, 0, 0);
EXPECT_CALL(*backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
MockDeviceManagementBackendFailRegister(
DeviceManagementBackend::kErrorRequestFailed));
@@ -234,7 +237,7 @@ TEST_F(DeviceManagementPolicyProviderTest, ErrorCausesNewRequest) {
TEST_F(DeviceManagementPolicyProviderTest, RefreshPolicies) {
InSequence s;
- CreateNewProvider(0, 0, 1000 * 1000, 1000, 0);
+ CreateNewProvider(0, 0, 0, 1000 * 1000, 1000, 0);
EXPECT_CALL(*backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
MockDeviceManagementBackendSucceedRegister());
EXPECT_CALL(*backend_, ProcessPolicyRequest(_, _, _, _)).WillOnce(
@@ -285,7 +288,7 @@ TEST_F(DeviceManagementPolicyProviderTest, InvalidTokenOnPolicyRequest) {
// device, the client should notice and throw away the device token and id.
TEST_F(DeviceManagementPolicyProviderTest, DeviceNoLongerManaged) {
InSequence s;
- CreateNewProvider(0, 0, 0, 0, 1000 * 1000);
+ CreateNewProvider(0, 0, 0, 0, 0, 1000 * 1000);
EXPECT_CALL(*backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
MockDeviceManagementBackendSucceedRegister());
EXPECT_CALL(*backend_, ProcessPolicyRequest(_, _, _, _)).WillOnce(
@@ -315,7 +318,7 @@ TEST_F(DeviceManagementPolicyProviderTest, UnmanagedDevice) {
EXPECT_TRUE(cache(provider_.get())->is_device_unmanaged());
// (2) On restart, the provider should detect that this is not the first
// login.
- CreateNewProvider(1000*1000, 0, 0, 0, 0);
+ CreateNewProvider(1000*1000, 0, 0, 0, 0, 0);
EXPECT_FALSE(waiting_for_initial_policies());
EXPECT_CALL(*backend_, ProcessRegisterRequest(_, _, _, _)).WillOnce(
MockDeviceManagementBackendSucceedRegister());

Powered by Google App Engine
This is Rietveld 408576698