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

components/domain_reliability/monitor_unittest.cc

Index: components/domain_reliability/monitor_unittest.cc
diff --git a/components/domain_reliability/monitor_unittest.cc b/components/domain_reliability/monitor_unittest.cc
index b5c928c392c17961781b5e387db71ed3f655f41a..9d146b44e7dcddd85ae637604b3ca76c6c7c8001 100644
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -70,7 +70,7 @@ class DomainReliabilityMonitorTest : public testing::Test {
 
   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(
@@ -127,7 +127,7 @@ TEST_F(DomainReliabilityMonitorTest, NetworkFailure) {
 
   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);
 
@@ -188,8 +188,7 @@ TEST_F(DomainReliabilityMonitorTest, LocalError) {
 
   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));
@@ -201,7 +200,7 @@ TEST_F(DomainReliabilityMonitorTest, WasFetchedViaProxy) {
 
   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;
@@ -241,8 +240,7 @@ TEST_F(DomainReliabilityMonitorTest, NoCachedIPFromFailedRevalidationRequest) {
   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;
@@ -288,7 +286,7 @@ TEST_F(DomainReliabilityMonitorTest, ClearBeacons) {
   // 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.
@@ -311,16 +309,14 @@ TEST_F(DomainReliabilityMonitorTest, ClearBeaconsWithFilter) {
       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|.
@@ -372,7 +368,7 @@ TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSelf) {
 
   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));
@@ -384,7 +380,7 @@ TEST_F(DomainReliabilityMonitorTest, WildcardMatchesSubdomain) {
 
   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));
@@ -396,7 +392,7 @@ TEST_F(DomainReliabilityMonitorTest, WildcardDoesntMatchSubsubdomain) {
 
   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));
@@ -410,7 +406,7 @@ TEST_F(DomainReliabilityMonitorTest, WildcardPrefersSelfToParentWildcard) {
 
   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));
@@ -426,7 +422,7 @@ TEST_F(DomainReliabilityMonitorTest,
 
   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));