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

components/domain_reliability/monitor.cc

Index: components/domain_reliability/monitor.cc
diff --git a/components/domain_reliability/monitor.cc b/components/domain_reliability/monitor.cc
index 2da1d509dd17718e182f26708671c3a276199ec4..f5bfa5ce5e6fe61b5e17564ca51e47b97c7a8635 100644
--- a/components/domain_reliability/monitor.cc
+++ b/components/domain_reliability/monitor.cc
@@ -28,22 +28,6 @@ namespace domain_reliability {
 
 namespace {
 
-int URLRequestStatusToNetError(const net::URLRequestStatus& status) {
-  switch (status.status()) {
-    case net::URLRequestStatus::SUCCESS:
-      return net::OK;
-    case net::URLRequestStatus::IO_PENDING:
-      return net::ERR_IO_PENDING;
-    case net::URLRequestStatus::CANCELED:
-      return net::ERR_ABORTED;
-    case net::URLRequestStatus::FAILED:
-      return status.error();
-    default:
-      NOTREACHED();
-      return net::ERR_UNEXPECTED;
-  }
-}
-
 // Creates a new beacon based on |beacon_template| but fills in the status,
 // chrome_error, and server_ip fields based on the endpoint and result of
 // |attempt|.
@@ -186,14 +170,16 @@ void DomainReliabilityMonitor::SetDiscardUploads(bool discard_uploads) {
   discard_uploads_set_ = true;
 }
 
+// TODO(maksims): Make this take net_error.

[davidben, 2016/09/06 17:07:28]

It does not appear this CL does not actually do anything to this directory
except lose the logic in URLRequestStatusToNetError. I think this TODO needs to
be resolved at the same time as converting this directory. So either remove the
changes to this directory and leave it for later or fully route the net_error
out of URLRequest correctly.

[maksims (do not use this acc), 2016/09/12 12:11:54]

Thank you for your feedback. I'll leave this for second iteration then after all
the other changes land, otherwise I'll have to change quite a lot, becuase this
method is overridden by other clients as well.

 void DomainReliabilityMonitor::OnBeforeRedirect(net::URLRequest* request) {
   DCHECK(OnNetworkThread());
   DCHECK(discard_uploads_set_);
 
   // Record the redirect itself in addition to the final request.
-  OnRequestLegComplete(RequestInfo(*request));
+  OnRequestLegComplete(RequestInfo(*request, request->status().error()));
 }
 
+// TODO(maksims): Make this take net_error.
 void DomainReliabilityMonitor::OnCompleted(net::URLRequest* request,
                                            bool started) {
   DCHECK(OnNetworkThread());
@@ -201,7 +187,7 @@ void DomainReliabilityMonitor::OnCompleted(net::URLRequest* request,
 
   if (!started)
     return;
-  RequestInfo request_info(*request);
+  RequestInfo request_info(*request, request->status().error());
   OnRequestLegComplete(request_info);
 
   if (request_info.response_info.network_accessed) {
@@ -265,9 +251,10 @@ DomainReliabilityMonitor::CreateContextForConfig(
 DomainReliabilityMonitor::RequestInfo::RequestInfo() {}
 
 DomainReliabilityMonitor::RequestInfo::RequestInfo(
-    const net::URLRequest& request)
+    const net::URLRequest& request,
+    int error)
     : url(request.url()),
-      status(request.status()),
+      net_error(error),
       response_info(request.response_info()),
       load_flags(request.load_flags()),
       upload_depth(
@@ -295,7 +282,7 @@ bool DomainReliabilityMonitor::RequestInfo::ShouldReportRequest(
   // that Domain Reliability is interested in.
   if (request.response_info.network_accessed)
     return true;
-  if (URLRequestStatusToNetError(request.status) != net::OK)
+  if (request.net_error != net::OK)
     return true;
   if (request.details.quic_port_migration_detected)
     return true;
@@ -320,8 +307,8 @@ void DomainReliabilityMonitor::OnRequestLegComplete(
   else
     response_code = -1;
 
-  net::ConnectionAttempt url_request_attempt(
-      request.remote_endpoint, URLRequestStatusToNetError(request.status));
+  net::ConnectionAttempt url_request_attempt(request.remote_endpoint,
+                                             request.net_error);
 
   DomainReliabilityBeacon beacon_template;
   if (request.response_info.connection_info !=