Index: components/domain_reliability/monitor_unittest.cc |
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc |
index 6e7b9134fe434c3e2ea42bc3a75b82297120adc0..1dbe5b3d78e30b12339287413b6ee5caa171b328 100644 |
--- a/components/domain_reliability/monitor_unittest.cc |
+++ b/components/domain_reliability/monitor_unittest.cc |
@@ -11,6 +11,8 @@ |
#include "base/bind.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop_proxy.h" |
+#include "base/prefs/pref_registry_simple.h" |
+#include "base/prefs/testing_pref_service.h" |
#include "base/test/test_simple_task_runner.h" |
#include "components/domain_reliability/baked_in_configs.h" |
#include "components/domain_reliability/beacon.h" |
@@ -34,6 +36,8 @@ typedef std::vector<DomainReliabilityBeacon> BeaconVector; |
static const size_t kAlwaysReportIndex = 0u; |
static const size_t kNeverReportIndex = 1u; |
+static const char* kPrefName = "reporting_enabled"; |
+ |
scoped_refptr<net::HttpResponseHeaders> MakeHttpResponseHeaders( |
const std::string& headers) { |
return scoped_refptr<net::HttpResponseHeaders>( |
@@ -48,16 +52,31 @@ class DomainReliabilityMonitorTest : public testing::Test { |
typedef DomainReliabilityMonitor::RequestInfo RequestInfo; |
DomainReliabilityMonitorTest() |
- : network_task_runner_(new base::TestSimpleTaskRunner()), |
+ : pref_task_runner_(new base::TestSimpleTaskRunner()), |
+ network_task_runner_(new base::TestSimpleTaskRunner()), |
url_request_context_getter_( |
new net::TestURLRequestContextGetter(network_task_runner_)), |
time_(new MockTime()), |
- monitor_("test-reporter", scoped_ptr<MockableTime>(time_)), |
+ pref_service_(CreatePrefService()), |
+ monitor_("test-reporter", |
+ pref_task_runner_, |
+ network_task_runner_, |
+ pref_service_.get(), |
+ kPrefName, |
+ scoped_ptr<MockableTime>(time_)), |
context_(NULL) { |
- monitor_.Init(url_request_context_getter_); |
+ monitor_.MoveToNetworkThread(); |
+ monitor_.InitURLRequestContext(url_request_context_getter_); |
context_ = monitor_.AddContextForTesting(MakeTestConfig()); |
} |
+ static PrefService* CreatePrefService() { |
+ TestingPrefServiceSimple* prefs = new TestingPrefServiceSimple(); |
+ prefs->registry()->RegisterBooleanPref(kPrefName, false); |
+ prefs->SetUserPref(kPrefName, new base::FundamentalValue(true)); |
+ return prefs; |
+ } |
+ |
static RequestInfo MakeRequestInfo() { |
RequestInfo request; |
request.status = net::URLRequestStatus(); |
@@ -108,9 +127,11 @@ class DomainReliabilityMonitorTest : public testing::Test { |
return monitor_.AddContextForTesting(MakeTestConfigWithDomain(domain)); |
} |
+ scoped_refptr<base::TestSimpleTaskRunner> pref_task_runner_; |
scoped_refptr<base::TestSimpleTaskRunner> network_task_runner_; |
scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; |
MockTime* time_; |
+ scoped_ptr<PrefService> pref_service_; |
DomainReliabilityMonitor monitor_; |
DomainReliabilityContext* context_; |
DomainReliabilityMonitor::RequestInfo request_; |