|
 |
a1f6bc4 |
From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001
|
|
|
a1f6bc4 |
From: Jose Dapena Paz <jose.dapena@lge.com>
|
|
|
a1f6bc4 |
Date: Fri, 25 Oct 2019 19:01:29 +0000
|
|
|
a1f6bc4 |
Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector
|
|
|
a1f6bc4 |
|
|
|
a1f6bc4 |
Constructing NoDestructor with parenthesis constructor is ambiguous
|
|
|
a1f6bc4 |
in GCC. Use brace-initializer to avoid that problem. This fixes this
|
|
|
a1f6bc4 |
build error:
|
|
|
a1f6bc4 |
|
|
|
a1f6bc4 |
Bug: 819294
|
|
|
a1f6bc4 |
Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d
|
|
|
a1f6bc4 |
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910
|
|
|
a1f6bc4 |
Reviewed-by: Eric Orth <ericorth@chromium.org>
|
|
|
a1f6bc4 |
Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
|
|
|
a1f6bc4 |
Cr-Commit-Position: refs/heads/master@{#709569}
|
|
|
a1f6bc4 |
---
|
|
|
a1f6bc4 |
|
|
|
a1f6bc4 |
diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc
|
|
|
a1f6bc4 |
index 14997c4..637b6f2 100644
|
|
|
a1f6bc4 |
--- a/net/dns/dns_util.cc
|
|
|
a1f6bc4 |
+++ b/net/dns/dns_util.cc
|
|
|
a1f6bc4 |
@@ -144,7 +144,7 @@
|
|
|
a1f6bc4 |
// DohProviderId histogram suffix list in
|
|
|
a1f6bc4 |
// tools/metrics/histograms/histograms.xml.
|
|
|
a1f6bc4 |
static const base::NoDestructor<std::vector<DohUpgradeEntry>>
|
|
|
a1f6bc4 |
- upgradable_servers({
|
|
|
a1f6bc4 |
+ upgradable_servers{{
|
|
|
a1f6bc4 |
DohUpgradeEntry(
|
|
|
a1f6bc4 |
"CleanBrowsingAdult",
|
|
|
a1f6bc4 |
{"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
|
|
|
a1f6bc4 |
@@ -215,7 +215,7 @@
|
|
|
a1f6bc4 |
{"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"},
|
|
|
a1f6bc4 |
{"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */,
|
|
|
a1f6bc4 |
{"https://dns.quad9.net/dns-query", true /* use_post */}),
|
|
|
a1f6bc4 |
- });
|
|
|
a1f6bc4 |
+ }};
|
|
|
a1f6bc4 |
return *upgradable_servers;
|
|
|
a1f6bc4 |
}
|
|
|
a1f6bc4 |
|