Commit 49c90a4a authored by CJ DiMeglio's avatar CJ DiMeglio Committed by Commit Bot

Revert "Reporting: Include include-subdomains in net log"

This reverts commit 210545ea.

Reason for revert: Causes ModuleEventSinkImplTest.CallsForwardedAsExpected to fail. 

Original change's description:
> Reporting: Include include-subdomains in net log
> 
> We weren't including the `include-subdomains` field of each endpoint
> group in the data we were handing over to the net-internals page.  (The
> net-internals code that reads this field is already there; we just
> weren't filling in a value.)
> 
> Bug: 829353
> Change-Id: Ifdff1d6e0baf802eb7f094571060b93c761936af
> Reviewed-on: https://chromium-review.googlesource.com/1019661
> Reviewed-by: Julia Tuttle <juliatuttle@chromium.org>
> Commit-Queue: Douglas Creager <dcreager@google.com>
> Cr-Commit-Position: refs/heads/master@{#555755}

TBR=juliatuttle@chromium.org,dcreager@google.com

Change-Id: I720f83c34a1df94a9f3193c6dc453ab80bb98c8c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 829353
Reviewed-on: https://chromium-review.googlesource.com/1042623Reviewed-by: default avatarCJ DiMeglio <lethalantidote@chromium.org>
Commit-Queue: CJ DiMeglio <lethalantidote@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555862}
parent f946918f
......@@ -335,14 +335,11 @@ class ReportingCacheImpl : public ReportingCache {
std::vector<base::Value> endpoint_list;
for (const ReportingClient* client : clients) {
base::Value endpoint_dict(base::Value::Type::DICTIONARY);
// Reporting defines the group as a whole to have an expiration time
// and subdomains flag, not the individual endpoints within the group.
// Reporting defines the group as a whole to have an expiration time,
// not the individual endpoints within the group.
group_dict.SetKey(
"expires",
base::Value(NetLog::TickCountToString(client->expires)));
group_dict.SetKey("includeSubdomains",
base::Value(client->subdomains ==
ReportingClient::Subdomains::INCLUDE));
endpoint_dict.SetKey("url", base::Value(client->endpoint.spec()));
endpoint_dict.SetKey("priority", base::Value(client->priority));
endpoint_dict.SetKey("weight", base::Value(client->weight));
......
......@@ -409,7 +409,7 @@ TEST_F(ReportingCacheTest, GetClientsAsValue) {
const base::TimeTicks expires =
base::TimeTicks() + base::TimeDelta::FromDays(7);
SetClient(kOrigin1_, kEndpoint1_, false, kGroup1_, expires);
SetClient(kOrigin2_, kEndpoint2_, true, kGroup1_, expires);
SetClient(kOrigin2_, kEndpoint2_, false, kGroup1_, expires);
// Add some reports so that we can test the upload counts.
const ReportingReport* report1a = AddAndReturnReport(
......@@ -433,7 +433,6 @@ TEST_F(ReportingCacheTest, GetClientsAsValue) {
{
"name": "group1",
"expires": "604800000",
"includeSubdomains": false,
"endpoints": [
{"url": "https://endpoint1/", "priority": 0, "weight": 1,
"successful": {"uploads": 1, "reports": 2},
......@@ -448,7 +447,6 @@ TEST_F(ReportingCacheTest, GetClientsAsValue) {
{
"name": "group1",
"expires": "604800000",
"includeSubdomains": true,
"endpoints": [
{"url": "https://endpoint2/", "priority": 0, "weight": 1,
"successful": {"uploads": 0, "reports": 0},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment