Remove URLRequestStatus mutators and introduce FromError.

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 <map>
 #include <string>
 #include <vector>
 
@@ skipping 48 matching lines @@
         context_(nullptr) {
     monitor_.MoveToNetworkThread();
     monitor_.InitURLRequestContext(url_request_context_getter_);
     monitor_.SetDiscardUploads(false);
     context_ = monitor_.AddContextForTesting(MakeTestConfig());
   }
 
   static RequestInfo MakeRequestInfo() {
     RequestInfo request;
     request.status = net::URLRequestStatus();
-    request.status.set_status(net::URLRequestStatus::SUCCESS);
-    request.status.set_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.is_upload = false;
     return request;
@@ skipping 65 matching lines @@
   request.url = GURL("http://example/never_report");
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kNeverReportIndex, 1u, 0u));
 }
 
 TEST_F(DomainReliabilityMonitorTest, NetworkFailure) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
-  request.status.set_status(net::URLRequestStatus::FAILED);
-  request.status.set_error(net::ERR_CONNECTION_RESET);
+  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
   request.response_info.headers = nullptr;
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 0u, 1u));
 }
 
 TEST_F(DomainReliabilityMonitorTest, ServerFailure) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
   request.response_info.headers =
       MakeHttpResponseHeaders("HTTP/1.1 500 :(\n\n");
   OnRequestLegComplete(request);
 
   EXPECT_EQ(1u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 0u, 1u));
 }
 
 TEST_F(DomainReliabilityMonitorTest, NotReportedFailure) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/never_report");
-  request.status.set_status(net::URLRequestStatus::FAILED);
-  request.status.set_error(net::ERR_CONNECTION_RESET);
+  request.status = net::URLRequestStatus::FromError(net::ERR_CONNECTION_RESET);
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kNeverReportIndex, 0u, 1u));
 }
 
 TEST_F(DomainReliabilityMonitorTest, Request) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
   OnRequestLegComplete(request);
@@ skipping 32 matching lines @@
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 0u, 0u));
 }
 
 // Make sure the monitor does not log a network-local error.
 TEST_F(DomainReliabilityMonitorTest, LocalError) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
-  request.status.set_status(net::URLRequestStatus::FAILED);
-  request.status.set_error(net::ERR_PROXY_CONNECTION_FAILED);
+  request.status =
+      net::URLRequestStatus::FromError(net::ERR_PROXY_CONNECTION_FAILED);
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountPendingBeacons());
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 0u, 0u));
 }
 
 // Make sure the monitor does not log the proxy's IP if one was used.
 TEST_F(DomainReliabilityMonitorTest, WasFetchedViaProxy) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
@@ skipping 24 matching lines @@
   EXPECT_EQ(1u, beacons.size());
   EXPECT_TRUE(beacons[0].server_ip.empty());
 }
 
 // Make sure the monitor does not log the cached IP returned with a failed
 // cache revalidation request.
 TEST_F(DomainReliabilityMonitorTest, NoCachedIPFromFailedRevalidationRequest) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
   request.response_info.was_cached = true;
-  request.status.set_status(net::URLRequestStatus::FAILED);
-  request.status.set_error(net::ERR_NAME_RESOLUTION_FAILED);
+  request.status =
+      net::URLRequestStatus::FromError(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 45 matching lines @@
 TEST_F(DomainReliabilityMonitorTest, ClearContexts) {
   // Initially the monitor should have just the test context.
   EXPECT_EQ(1u, monitor_.contexts_size_for_testing());
 
   monitor_.ClearBrowsingData(CLEAR_CONTEXTS);
 
   // Clearing contexts should leave the monitor with none.
   EXPECT_EQ(0u, monitor_.contexts_size_for_testing());
 }
 
+// TODO(davidben): When https://crbug.com/490311 is resolved, this test can be
+// removed.
 TEST_F(DomainReliabilityMonitorTest, IgnoreSuccessError) {
   RequestInfo request = MakeRequestInfo();
   request.url = GURL("http://example/always_report");
-  request.status.set_error(net::ERR_QUIC_PROTOCOL_ERROR);
+  request.status = net::URLRequestStatus(net::URLRequestStatus::SUCCESS,
+                                         net::ERR_QUIC_PROTOCOL_ERROR);
   OnRequestLegComplete(request);
 
   BeaconVector beacons;
   context_->GetQueuedBeaconsForTesting(&beacons);
   EXPECT_EQ(1u, beacons.size());
   EXPECT_EQ(net::OK, beacons[0].chrome_error);
 
   EXPECT_TRUE(CheckRequestCounts(kAlwaysReportIndex, 1u, 0u));
 }
 
@@ skipping 57 matching lines @@
   request.url = GURL("http://test.wildcard/always_report");
   OnRequestLegComplete(request);
 
   EXPECT_TRUE(CheckRequestCounts(context1, kAlwaysReportIndex, 1u, 0u));
   EXPECT_TRUE(CheckRequestCounts(context2, kAlwaysReportIndex, 0u, 0u));
 }
 
 }  // namespace
 
 }  // namespace domain_reliability