Use modified URLRequest::Read() and delegate methods in components/

components/domain_reliability/monitor_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/domain_reliability/monitor.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
@@ skipping 52 matching lines @@
                  pref_task_runner_,
                  network_task_runner_,
                  std::unique_ptr<MockableTime>(time_)) {
     monitor_.MoveToNetworkThread();
     monitor_.InitURLRequestContext(url_request_context_getter_);
     monitor_.SetDiscardUploads(false);
   }
 
   static RequestInfo MakeRequestInfo() {
     RequestInfo request;
-    request.status = net::URLRequestStatus();
+    request.net_error = net::OK;
     request.response_info.socket_address =
         net::HostPortPair::FromString("12.34.56.78:80");
     request.response_info.headers = MakeHttpResponseHeaders(
         "HTTP/1.1 200 OK\n\n");
     request.response_info.was_cached = false;
     request.response_info.network_accessed = true;
     request.response_info.was_fetched_via_proxy = false;
     request.load_flags = 0;
     request.upload_depth = 0;
     return request;
@@ skipping 36 matching lines @@
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, NetworkFailure) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   request.response_info.headers = nullptr;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, GoAwayWithPortMigrationDetected) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   RequestInfo request = MakeRequestInfo();
@@ skipping 40 matching lines @@
 
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 }
 
 // Make sure the monitor does not log a network-local error.
 TEST_F(DomainReliabilityMonitorTest, LocalError) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
-  request.status =
-      net::URLRequestStatus::FromError(net::ERR_PROXY_CONNECTION_FAILED);
+  request.net_error = net::ERR_PROXY_CONNECTION_FAILED;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 }
 
 // Make sure the monitor does not log the proxy's IP if one was used.
 TEST_F(DomainReliabilityMonitorTest, WasFetchedViaProxy) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   request.response_info.socket_address =
       net::HostPortPair::FromString("127.0.0.1:3128");
   request.response_info.was_fetched_via_proxy = true;
   OnRequestLegComplete(request);
 
   BeaconVector beacons;
   context->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(1u, beacons.size());
   EXPECT_TRUE(beacons[0]->server_ip.empty());
 }
@@ skipping 19 matching lines @@
 }
 
 // Make sure the monitor does not log the cached IP returned with a failed
 // cache revalidation request.
 TEST_F(DomainReliabilityMonitorTest, NoCachedIPFromFailedRevalidationRequest) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
   request.response_info.was_cached = true;
-  request.status =
-      net::URLRequestStatus::FromError(net::ERR_NAME_RESOLUTION_FAILED);
+  request.net_error = net::ERR_NAME_RESOLUTION_FAILED;
   OnRequestLegComplete(request);
 
   BeaconVector beacons;
   context->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(1u, beacons.size());
   EXPECT_TRUE(beacons[0]->server_ip.empty());
 }
 
 TEST_F(DomainReliabilityMonitorTest, AtLeastOneBakedInConfig) {
   DCHECK(kBakedInJsonConfigs[0] != nullptr);
@@ skipping 25 matching lines @@
 TEST_F(DomainReliabilityMonitorTest, ClearBeacons) {
   DomainReliabilityContext* context = CreateAndAddContext();
 
   // Initially the monitor should have just the test context, with no beacons.
   EXPECT_EQ(1u, monitor_.contexts_size_for_testing());
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 
   // Add a beacon.
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   // Make sure it was added.
   EXPECT_EQ(1u, CountQueuedBeacons(context));
 
   monitor_.ClearBrowsingData(
       CLEAR_BEACONS, base::Callback<bool(const GURL&)>());
 
   // Make sure the beacon was cleared, but not the contexts.
   EXPECT_EQ(1u, monitor_.contexts_size_for_testing());
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, ClearBeaconsWithFilter) {
   // Create two contexts, each with one beacon.
   GURL origin1("http://example.com/");
   GURL origin2("http://example.org/");
 
   DomainReliabilityContext* context1 =
       CreateAndAddContextForOrigin(origin1, false);
   RequestInfo request = MakeRequestInfo();
   request.url = origin1;
-  request.status =
-      net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   DomainReliabilityContext* context2 =
       CreateAndAddContextForOrigin(origin2, false);
   request = MakeRequestInfo();
   request.url = origin2;
-  request.status =
-      net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   // Delete the beacons for |origin1|.
   monitor_.ClearBrowsingData(
       CLEAR_BEACONS,
       base::Bind(&GURL::operator==, base::Unretained(&origin1)));
 
   // Beacons for |context1| were cleared. Beacons for |context2| and
   // the contexts themselves were not.
   EXPECT_EQ(2u, monitor_.contexts_size_for_testing());
@@ skipping 31 matching lines @@
   // Only one of the contexts should have been deleted.
   EXPECT_EQ(1u, monitor_.contexts_size_for_testing());
 }
 
 TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSelf) {
   DomainReliabilityContext* context =
       CreateAndAddContextForOrigin(GURL("https://wildcard/"), true);
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://wildcard/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSubdomain) {
   DomainReliabilityContext* context =
       CreateAndAddContextForOrigin(GURL("https://wildcard/"), true);
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://test.wildcard/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, WildcardDoesntMatchSubsubdomain) {
   DomainReliabilityContext* context =
       CreateAndAddContextForOrigin(GURL("https://wildcard/"), true);
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://test.test.wildcard/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountQueuedBeacons(context));
 }
 
 TEST_F(DomainReliabilityMonitorTest, WildcardPrefersSelfToParentWildcard) {
   DomainReliabilityContext* context1 =
       CreateAndAddContextForOrigin(GURL("https://test.wildcard/"), false);
   DomainReliabilityContext* context2 =
       CreateAndAddContextForOrigin(GURL("https://wildcard/"), true);
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://test.wildcard/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountQueuedBeacons(context1));
   EXPECT_EQ(0u, CountQueuedBeacons(context2));
 }
 
 TEST_F(DomainReliabilityMonitorTest,
     WildcardPrefersSelfWildcardToParentWildcard) {
   DomainReliabilityContext* context1 =
       CreateAndAddContextForOrigin(GURL("https://test.wildcard/"), true);
   DomainReliabilityContext* context2 =
       CreateAndAddContextForOrigin(GURL("https://wildcard/"), true);
 
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://test.wildcard/");
-  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
+  request.net_error = net::ERR_CONNECTION_RESET;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountQueuedBeacons(context1));
   EXPECT_EQ(0u, CountQueuedBeacons(context2));
 }
 
 }  // namespace
 
 }  // namespace domain_reliability