diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn index aeb5d013470dd..757530fe89eb0 100644 --- a/android_webview/BUILD.gn +++ b/android_webview/BUILD.gn @@ -581,14 +581,14 @@ source_set("common") { "browser/memory_metrics_logger.h", "browser/net/aw_http_user_agent_settings.cc", "browser/net/aw_http_user_agent_settings.h", - "browser/net/aw_proxy_config_monitor.cc", - "browser/net/aw_proxy_config_monitor.h", "browser/network_service/android_stream_reader_url_loader.cc", "browser/network_service/android_stream_reader_url_loader.h", "browser/network_service/aw_network_change_notifier.cc", "browser/network_service/aw_network_change_notifier.h", "browser/network_service/aw_network_change_notifier_factory.cc", "browser/network_service/aw_network_change_notifier_factory.h", + "browser/network_service/aw_proxy_config_monitor.cc", + "browser/network_service/aw_proxy_config_monitor.h", "browser/network_service/aw_proxying_restricted_cookie_manager.cc", "browser/network_service/aw_proxying_restricted_cookie_manager.h", "browser/network_service/aw_proxying_url_loader_factory.cc", diff --git a/android_webview/browser/aw_browser_context.h b/android_webview/browser/aw_browser_context.h index 0d3d38a2c70f0..d33e8c90d203a 100644 --- a/android_webview/browser/aw_browser_context.h +++ b/android_webview/browser/aw_browser_context.h @@ -9,7 +9,7 @@ #include <vector> #include "android_webview/browser/aw_ssl_host_state_delegate.h" -#include "android_webview/browser/net/aw_proxy_config_monitor.h" +#include "android_webview/browser/network_service/aw_proxy_config_monitor.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/macros.h" diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 46e18e1ff64c9..35adb9522bb05 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -28,7 +28,7 @@ #include "android_webview/browser/aw_web_contents_view_delegate.h" #include "android_webview/browser/cookie_manager.h" #include "android_webview/browser/js_java_interaction/js_api_handler_factory.h" -#include "android_webview/browser/net/aw_proxy_config_monitor.h" +#include "android_webview/browser/network_service/aw_proxy_config_monitor.h" #include "android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.h" #include "android_webview/browser/network_service/aw_proxying_url_loader_factory.h" #include "android_webview/browser/network_service/aw_url_loader_throttle.h" diff --git a/android_webview/browser/aw_proxy_controller.cc b/android_webview/browser/aw_proxy_controller.cc index fee33f080ac9d..41674a3f88b6b 100644 --- a/android_webview/browser/aw_proxy_controller.cc +++ b/android_webview/browser/aw_proxy_controller.cc @@ -4,7 +4,7 @@ #include "android_webview/browser/aw_browser_context.h" #include "android_webview/browser/aw_browser_process.h" -#include "android_webview/browser/net/aw_proxy_config_monitor.h" +#include "android_webview/browser/network_service/aw_proxy_config_monitor.h" #include "android_webview/native_jni/AwProxyController_jni.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" diff --git a/android_webview/browser/net/aw_proxy_config_monitor.cc b/android_webview/browser/network_service/aw_proxy_config_monitor.cc similarity index 96% rename from android_webview/browser/net/aw_proxy_config_monitor.cc rename to android_webview/browser/network_service/aw_proxy_config_monitor.cc index e8d3650bfc8ce..f3e01900ab65b 100644 --- a/android_webview/browser/net/aw_proxy_config_monitor.cc +++ b/android_webview/browser/network_service/aw_proxy_config_monitor.cc @@ -2,15 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "android_webview/browser/net/aw_proxy_config_monitor.h" +#include "android_webview/browser/network_service/aw_proxy_config_monitor.h" #include <memory> #include <utility> #include "base/barrier_closure.h" #include "base/bind.h" -#include "base/feature_list.h" -#include "services/network/public/cpp/features.h" namespace android_webview { diff --git a/android_webview/browser/net/aw_proxy_config_monitor.h b/android_webview/browser/network_service/aw_proxy_config_monitor.h similarity index 88% rename from android_webview/browser/net/aw_proxy_config_monitor.h rename to android_webview/browser/network_service/aw_proxy_config_monitor.h index 00e2834089e79..2edf198f7059a 100644 --- a/android_webview/browser/net/aw_proxy_config_monitor.h +++ b/android_webview/browser/network_service/aw_proxy_config_monitor.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef ANDROID_WEBVIEW_BROWSER_NET_AW_PROXY_CONFIG_MONITOR_H_ -#define ANDROID_WEBVIEW_BROWSER_NET_AW_PROXY_CONFIG_MONITOR_H_ +#ifndef ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_PROXY_CONFIG_MONITOR_H_ +#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_PROXY_CONFIG_MONITOR_H_ #include <memory> #include <vector> @@ -53,4 +53,4 @@ class AwProxyConfigMonitor : public net::ProxyConfigService::Observer { } // namespace android_webview -#endif // ANDROID_WEBVIEW_BROWSER_NET_AW_PROXY_CONFIG_MONITOR_H_ +#endif // ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_PROXY_CONFIG_MONITOR_H_