Move net/proxy to net/proxy_resolution
This renames net/proxy to net/proxy_resolution, and hoists net/proxy/proxy_server* to net/base.
NOPRESUBMIT=true
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Bug: 613632
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.linux:linux_mojo;master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Id8ceccb9b75ab1fc87e184de8661527444eedf1f
Reviewed-on: https://chromium-review.googlesource.com/868176
Commit-Queue: Lily Houghton <[email protected]>
Reviewed-by: Tarun Bansal <[email protected]>
Reviewed-by: Evgeniy Stepanov <[email protected]>
Reviewed-by: Steven Bennetts <[email protected]>
Reviewed-by: Bo <[email protected]>
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Gene Gutnik <[email protected]>
Reviewed-by: Ramin Halavati <[email protected]>
Reviewed-by: Eugene But <[email protected]>
Reviewed-by: Eric Roman <[email protected]>
Cr-Commit-Position: refs/heads/master@{#531020}diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index ab0a6bc..451f5ba3 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -55,9 +55,9 @@
#include "net/log/net_log_with_source.h"
#include "net/net_features.h"
#include "net/nqe/network_quality_estimator.h"
-#include "net/proxy/proxy_info.h"
-#include "net/proxy/proxy_retry_info.h"
-#include "net/proxy/proxy_service.h"
+#include "net/proxy_resolution/proxy_info.h"
+#include "net/proxy_resolution/proxy_retry_info.h"
+#include "net/proxy_resolution/proxy_service.h"
#include "net/ssl/channel_id_service.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/ssl/ssl_config_service.h"
