Index: chrome/browser/policy/cloud_policy_refresh_scheduler_unittest.cc |
diff --git a/chrome/browser/policy/cloud_policy_refresh_scheduler_unittest.cc b/chrome/browser/policy/cloud_policy_refresh_scheduler_unittest.cc |
index d133be7335f394ca9d3864c3631533b6a704d3c3..2d78f8e908959f8af6f281211ff65f34d4f9462e 100644 |
--- a/chrome/browser/policy/cloud_policy_refresh_scheduler_unittest.cc |
+++ b/chrome/browser/policy/cloud_policy_refresh_scheduler_unittest.cc |
@@ -12,8 +12,7 @@ |
#include "chrome/browser/policy/mock_cloud_policy_store.h" |
#include "chrome/browser/policy/test_task_runner.h" |
#include "chrome/browser/prefs/browser_prefs.h" |
-#include "chrome/common/pref_names.h" |
-#include "chrome/test/base/testing_pref_service.h" |
+#include "policy/policy_constants.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -34,10 +33,7 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test { |
protected: |
CloudPolicyRefreshSchedulerTest() |
: task_runner_(new TestTaskRunner()), |
- network_change_notifier_(net::NetworkChangeNotifier::CreateMock()) { |
- chrome::RegisterLocalState(&prefs_); |
- prefs_.SetInteger(prefs::kUserPolicyRefreshRate, kPolicyRefreshRate); |
- } |
+ network_change_notifier_(net::NetworkChangeNotifier::CreateMock()) {} |
virtual void SetUp() OVERRIDE { |
client_.SetDMToken("token"); |
@@ -61,9 +57,10 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test { |
} |
CloudPolicyRefreshScheduler* CreateRefreshScheduler() { |
- return new CloudPolicyRefreshScheduler(&client_, &store_, &prefs_, |
- prefs::kUserPolicyRefreshRate, |
- task_runner_); |
+ CloudPolicyRefreshScheduler* scheduler = |
+ new CloudPolicyRefreshScheduler(&client_, &store_, task_runner_); |
+ scheduler->SetRefreshDelay(kPolicyRefreshRate); |
+ return scheduler; |
} |
void NotifyIPAddressChanged() { |
@@ -82,7 +79,6 @@ class CloudPolicyRefreshSchedulerTest : public testing::Test { |
MessageLoop loop_; |
MockCloudPolicyClient client_; |
MockCloudPolicyStore store_; |
- TestingPrefService prefs_; |
scoped_refptr<TestTaskRunner> task_runner_; |
scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; |
@@ -136,19 +132,19 @@ TEST_F(CloudPolicyRefreshSchedulerTest, Unregistered) { |
client_.NotifyPolicyFetched(); |
client_.NotifyRegistrationStateChanged(); |
client_.NotifyClientError(); |
+ scheduler->SetRefreshDelay(12 * 60 * 60 * 1000); |
store_.NotifyStoreLoaded(); |
store_.NotifyStoreError(); |
- prefs_.SetInteger(prefs::kUserPolicyRefreshRate, 12 * 60 * 60 * 1000); |
} |
class CloudPolicyRefreshSchedulerSteadyStateTest |
: public CloudPolicyRefreshSchedulerTest { |
protected: |
CloudPolicyRefreshSchedulerSteadyStateTest() |
- : refresh_scheduler_(&client_, &store_, &prefs_, |
- prefs::kUserPolicyRefreshRate, task_runner_) {} |
+ : refresh_scheduler_(&client_, &store_, task_runner_) {} |
virtual void SetUp() OVERRIDE { |
+ refresh_scheduler_.SetRefreshDelay(kPolicyRefreshRate); |
CloudPolicyRefreshSchedulerTest::SetUp(); |
last_refresh_ = base::Time::NowFromSystemTime(); |
client_.NotifyPolicyFetched(); |
@@ -185,15 +181,15 @@ TEST_F(CloudPolicyRefreshSchedulerSteadyStateTest, OnStoreError) { |
TEST_F(CloudPolicyRefreshSchedulerSteadyStateTest, RefreshDelayChange) { |
const int delay_short_ms = 5 * 60 * 1000; |
- prefs_.SetInteger(prefs::kUserPolicyRefreshRate, delay_short_ms); |
+ refresh_scheduler_.SetRefreshDelay(delay_short_ms); |
CheckTiming(CloudPolicyRefreshScheduler::kRefreshDelayMinMs); |
const int delay_ms = 12 * 60 * 60 * 1000; |
- prefs_.SetInteger(prefs::kUserPolicyRefreshRate, delay_ms); |
+ refresh_scheduler_.SetRefreshDelay(delay_ms); |
CheckTiming(delay_ms); |
const int delay_long_ms = 2 * 24 * 60 * 60 * 1000; |
- prefs_.SetInteger(prefs::kUserPolicyRefreshRate, delay_long_ms); |
+ refresh_scheduler_.SetRefreshDelay(delay_long_ms); |
CheckTiming(CloudPolicyRefreshScheduler::kRefreshDelayMaxMs); |
} |