Network Error Logging: Remove redundant `uri` field

Per https://github.com/w3c/network-error-logging/pull/90, a NEL report's
`url` field now contains the (sanitized) URL of the request that the
report describes.  (Before that spec update, it was supposed to contain
the URL of the page that made the request, which isn't relevant for
NEL.)  Now that the report contains the "right" URL, the NEL body's
`uri` field is redundant, and can be removed.

Bug: 748549
Change-Id: Ibd2b0213b829e94329ecc7263baecd549d41e40c
Reviewed-on: https://chromium-review.googlesource.com/1141271Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Douglas Creager <dcreager@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576312}

chrome/browser/net/reporting_browsertest.cc

@@ -152,13 +152,12 @@ IN_PROC_BROWSER_TEST_F(ReportingBrowserTest, TestReportingHeadersProcessed) {
               "status_code": 204,
               "phase": "application",
               "type": "ok",
-              "uri": "https://example.com:%d/original",
             },
             "type": "network-error",
             "url": "https://example.com:%d/original",
           },
         ]
       )json",
-      port(), port()));
+      port()));
   EXPECT_EQ(*expected, *actual);
 }

net/network_error_logging/network_error_logging_end_to_end_test.cc

@@ -206,7 +206,6 @@ TEST_F(NetworkErrorLoggingEndToEndTest, MAYBE_ReportNetworkError) {
 
   ExpectDictStringValue("http.response.empty", *body_dict, "type");
   ExpectDictIntegerValue(0, *body_dict, "status_code");
-  ExpectDictStringValue(GetFailURL().spec(), *body_dict, "uri");
 }
 
 #if defined(OS_WIN)

net/network_error_logging/network_error_logging_service.cc

@@ -546,7 +546,6 @@ class NetworkErrorLoggingServiceImpl : public NetworkErrorLoggingService {
       const RequestDetails& details) const {
     auto body = std::make_unique<base::DictionaryValue>();
 
-    body->SetString(kUriKey, details.uri.spec());
     body->SetString(kReferrerKey, details.referrer.spec());
     body->SetDouble(kSamplingFractionKey, sampling_fraction);
     body->SetString(kServerIpKey, details.server_ip.ToString());
@@ -586,7 +585,6 @@ const char NetworkErrorLoggingService::kReportType[] = "network-error";
 // that generate new NEL reports to bypass the age limit on Reporting reports.
 const int NetworkErrorLoggingService::kMaxNestedReportDepth = 1;
 
-const char NetworkErrorLoggingService::kUriKey[] = "uri";
 const char NetworkErrorLoggingService::kReferrerKey[] = "referrer";
 const char NetworkErrorLoggingService::kSamplingFractionKey[] =
     "sampling_fraction";

net/network_error_logging/network_error_logging_service.h

@@ -78,7 +78,6 @@ class NET_EXPORT NetworkErrorLoggingService {
 
   // Keys for data included in report bodies. Exposed for tests.
 
-  static const char kUriKey[];
   static const char kReferrerKey[];
   static const char kSamplingFractionKey[];
   static const char kServerIpKey[];

net/network_error_logging/network_error_logging_service_unittest.cc

@@ -260,8 +260,6 @@ TEST_F(NetworkErrorLoggingServiceTest, SuccessReportQueued) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   // TODO(juliatuttle): Extract these constants.
@@ -298,8 +296,6 @@ TEST_F(NetworkErrorLoggingServiceTest, FailureReportQueued) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   // TODO(juliatuttle): Extract these constants.
@@ -336,8 +332,6 @@ TEST_F(NetworkErrorLoggingServiceTest, HttpErrorReportQueued) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   // TODO(juliatuttle): Extract these constants.
@@ -375,8 +369,6 @@ TEST_F(NetworkErrorLoggingServiceTest, SuccessReportDowngraded) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   ExpectDictDoubleValue(1.0, *body,
@@ -413,8 +405,6 @@ TEST_F(NetworkErrorLoggingServiceTest, FailureReportDowngraded) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   ExpectDictDoubleValue(1.0, *body,
@@ -451,8 +441,6 @@ TEST_F(NetworkErrorLoggingServiceTest, HttpErrorReportDowngraded) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   ExpectDictDoubleValue(1.0, *body,
@@ -489,8 +477,6 @@ TEST_F(NetworkErrorLoggingServiceTest, DNSFailureReportNotDowngraded) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   ExpectDictDoubleValue(1.0, *body,
@@ -526,8 +512,6 @@ TEST_F(NetworkErrorLoggingServiceTest, SuccessPOSTReportQueued) {
 
   const base::DictionaryValue* body;
   ASSERT_TRUE(reports()[0].body->GetAsDictionary(&body));
-  base::ExpectDictStringValue(kUrl_.spec(), *body,
-                              NetworkErrorLoggingService::kUriKey);
   base::ExpectDictStringValue(kReferrer_.spec(), *body,
                               NetworkErrorLoggingService::kReferrerKey);
   ExpectDictDoubleValue(1.0, *body,