Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / domain_reliability / monitor_unittest.cc

diff --git a/src/components/domain_reliability/monitor_unittest.cc b/src/components/domain_reliability/monitor_unittest.cc
index 1dbe5b3..4622af7 100644 (file)
--- a/src/components/domain_reliability/monitor_unittest.cc
+++ b/src/components/domain_reliability/monitor_unittest.cc
@@ -11,8 +11,6 @@
 #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"
@@ -36,8 +34,6 @@ 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>(
@@ -57,26 +53,17 @@ class DomainReliabilityMonitorTest : public testing::Test {
         url_request_context_getter_(
             new net::TestURLRequestContextGetter(network_task_runner_)),
         time_(new MockTime()),
-        pref_service_(CreatePrefService()),
         monitor_("test-reporter",
                  pref_task_runner_,
                  network_task_runner_,
-                 pref_service_.get(),
-                 kPrefName,
                  scoped_ptr<MockableTime>(time_)),
         context_(NULL) {
     monitor_.MoveToNetworkThread();
     monitor_.InitURLRequestContext(url_request_context_getter_);
+    monitor_.SetDiscardUploads(false);
     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();
@@ -131,7 +118,6 @@ class DomainReliabilityMonitorTest : public testing::Test {
   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_;
@@ -269,6 +255,10 @@ TEST_F(DomainReliabilityMonitorTest, WasFetchedViaProxy) {
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 1u, 0u));
 }
 
+TEST_F(DomainReliabilityMonitorTest, AtLeastOneBakedInConfig) {
+  DCHECK(kBakedInJsonConfigs[0] != NULL);
+}
+
 // Will fail when baked-in configs expire, as a reminder to update them.
 // (Contact ttuttle@chromium.org if this starts failing.)
 TEST_F(DomainReliabilityMonitorTest, AddBakedInConfigs) {