Commit 4ac34d08 authored by Jon Mann's avatar Jon Mann Committed by Commit Bot

Wi-Fi Sync: Rename proxy whitelist_domains to excluded_domains.

Fixed: 1123781
Change-Id: I45458f24df0c77f97f2997a7384618262b18af47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2387309
Commit-Queue: Jon Mann <jonmann@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804050}
parent 419bd388
......@@ -170,7 +170,7 @@ ProxyConfigurationProtoFromMojo(
if (proxy_settings->exclude_domains) {
for (const std::string& domain :
proxy_settings->exclude_domains->active_value) {
manual_settings->add_whitelisted_domains(domain);
manual_settings->add_excluded_domains(domain);
}
}
}
......@@ -235,7 +235,7 @@ network_config::mojom::ProxySettingsPtr MojoProxySettingsFromProto(
std::vector<std::string> exclude_domains;
for (const std::string& domain :
synced_manual_configuration.whitelisted_domains()) {
synced_manual_configuration.excluded_domains()) {
exclude_domains.push_back(domain);
}
proxy_settings->exclude_domains = std::move(exclude_domains);
......
......@@ -1175,7 +1175,7 @@ VISIT_PROTO_FIELDS(const sync_pb::WifiConfigurationSpecifics::
VISIT(secure_http_proxy_port);
VISIT(socks_host_url);
VISIT(socks_host_port);
VISIT_REP(whitelisted_domains);
VISIT_REP(excluded_domains);
}
VISIT_PROTO_FIELDS(
......
......@@ -71,7 +71,7 @@ message WifiConfigurationSpecifics {
optional int32 secure_http_proxy_port = 4;
optional string socks_host_url = 5;
optional int32 socks_host_port = 6;
repeated string whitelisted_domains = 7;
repeated string excluded_domains = 7;
}
// Only set if PROXY_OPTION_MANUAL.
optional ManualProxyConfiguration manual_proxy_configuration = 3;
......
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