From 408b62bcc2a12701624c14dab1ef6cd325bfef16 Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Wed, 4 Apr 2018 14:58:09 +0200 Subject: [PATCH] Move net/proxy to net/proxy_resolution https://chromium-review.googlesource.com/868176 Also includes changes from: Rename files relating to PAC (proxy auto config). https://chromium-review.googlesource.com/836927 --- atom/browser/api/atom_api_session.cc | 4 ++-- brightray/browser/browser_main_parts.cc | 2 +- brightray/browser/io_thread.cc | 2 +- brightray/browser/url_request_context_getter.cc | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/atom/browser/api/atom_api_session.cc b/atom/browser/api/atom_api_session.cc index c80973f439..9acaadff58 100644 --- a/atom/browser/api/atom_api_session.cc +++ b/atom/browser/api/atom_api_session.cc @@ -46,8 +46,8 @@ #include "net/dns/host_cache.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_auth_preferences.h" -#include "net/proxy/proxy_config_service_fixed.h" -#include "net/proxy/proxy_service.h" +#include "net/proxy_resolution/proxy_config_service_fixed.h" +#include "net/proxy_resolution/proxy_service.h" #include "net/url_request/static_http_user_agent_settings.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/brightray/browser/browser_main_parts.cc b/brightray/browser/browser_main_parts.cc index 4705abc986..fd6c1a9242 100644 --- a/brightray/browser/browser_main_parts.cc +++ b/brightray/browser/browser_main_parts.cc @@ -30,7 +30,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" #include "media/base/localized_strings.h" -#include "net/proxy/proxy_resolver_v8.h" +#include "net/proxy_resolution/proxy_resolver_v8.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/material_design/material_design_controller.h" #include "ui/base/resource/resource_bundle.h" diff --git a/brightray/browser/io_thread.cc b/brightray/browser/io_thread.cc index c96aa98065..10cbabb24b 100644 --- a/brightray/browser/io_thread.cc +++ b/brightray/browser/io_thread.cc @@ -5,7 +5,7 @@ #include "brightray/browser/io_thread.h" #include "content/public/browser/browser_thread.h" -#include "net/proxy/proxy_service.h" +#include "net/proxy_resolution/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" diff --git a/brightray/browser/url_request_context_getter.cc b/brightray/browser/url_request_context_getter.cc index 31219c5fa6..845946fda3 100644 --- a/brightray/browser/url_request_context_getter.cc +++ b/brightray/browser/url_request_context_getter.cc @@ -34,11 +34,11 @@ #include "net/http/http_auth_preferences.h" #include "net/http/http_server_properties_impl.h" #include "net/log/net_log.h" -#include "net/proxy/dhcp_proxy_script_fetcher_factory.h" -#include "net/proxy/proxy_config.h" -#include "net/proxy/proxy_config_service.h" -#include "net/proxy/proxy_script_fetcher_impl.h" -#include "net/proxy/proxy_service.h" +#include "net/proxy_resolution/dhcp_pac_file_fetcher_factory.h" +#include "net/proxy_resolution/pac_file_fetcher_impl.h" +#include "net/proxy_resolution/proxy_config.h" +#include "net/proxy_resolution/proxy_config_service.h" +#include "net/proxy_resolution/proxy_service.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/default_channel_id_store.h" #include "net/ssl/ssl_config_service_defaults.h"