Remove URLRequestStatus mutators and introduce FromError.

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 5a1897dd8d44a17a9e2ce76d57d57c92e152ed85..a14dcc4aaa8b4e3adc8bb520f4645241a91395e8 100644
--- a/components/domain_reliability/monitor_unittest.cc
+++ b/components/domain_reliability/monitor_unittest.cc
@@ -67,8 +67,6 @@ class DomainReliabilityMonitorTest : public testing::Test {
   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(
@@ -154,8 +152,7 @@ TEST_F(DomainReliabilityMonitorTest, NotReported) {
 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);
 
@@ -177,8 +174,7 @@ TEST_F(DomainReliabilityMonitorTest, ServerFailure) {
 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());
@@ -231,8 +227,7 @@ TEST_F(DomainReliabilityMonitorTest, IsUpload) {
 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_CONNECTION_FAILED);
   OnRequestLegComplete(request);
 
   EXPECT_EQ(0u, CountPendingBeacons());
@@ -277,8 +272,8 @@ 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;
@@ -344,10 +339,13 @@ TEST_F(DomainReliabilityMonitorTest, ClearContexts) {
   EXPECT_EQ(0u, monitor_.contexts_size_for_testing());
 }
 
+// TODO(davidben): When https://crbug.com/490311 is resolved, this test can be
+// removed.

[mmenke, 2015/06/02 18:41:33]

Remove it?  But this test is awesome!

 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;