Commit 65d89c1a authored by Eugene But's avatar Eugene But Committed by Commit Bot

Extract Cronet-only ios/net:network_protocol target.

Files in this target are not used in Chrome for iOS app.

Bug: 585700
Change-Id: Ib3a6b497a200f8c5afadf07b36a29c067b574f83
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1614462Reviewed-by: default avatarMisha Efimov <mef@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#660900}
parent 1843462f
...@@ -47,7 +47,8 @@ _cronet_deps = [ ...@@ -47,7 +47,8 @@ _cronet_deps = [
"//components/cronet/native:cronet_native_impl", "//components/cronet/native:cronet_native_impl",
"//components/grpc_support", "//components/grpc_support",
"//components/prefs:prefs", "//components/prefs:prefs",
"//ios/net:net", "//ios/net",
"//ios/net:network_protocol",
"//ios/web/public:user_agent", "//ios/web/public:user_agent",
"//ios/web/public/global_state", "//ios/web/public/global_state",
"//net", "//net",
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "ios/net/request_tracker.h"
#include "ios/web/public/user_agent.h" #include "ios/web/public/user_agent.h"
#include "ui/base/page_transition_types.h" #include "ui/base/page_transition_types.h"
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#ifndef IOS_CHROME_BROWSER_TABS_TAB_PRIVATE_H_ #ifndef IOS_CHROME_BROWSER_TABS_TAB_PRIVATE_H_
#define IOS_CHROME_BROWSER_TABS_TAB_PRIVATE_H_ #define IOS_CHROME_BROWSER_TABS_TAB_PRIVATE_H_
#include "ios/net/request_tracker.h"
@class CRWWebController; @class CRWWebController;
// Exposed private methods for testing purpose. // Exposed private methods for testing purpose.
......
...@@ -31,9 +31,6 @@ source_set("net") { ...@@ -31,9 +31,6 @@ source_set("net") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
sources = [ sources = [
"chunked_data_stream_uploader.cc",
"chunked_data_stream_uploader.h",
"clients/crn_network_client_protocol.h",
"cookies/cookie_cache.cc", "cookies/cookie_cache.cc",
"cookies/cookie_cache.h", "cookies/cookie_cache.h",
"cookies/cookie_creation_time_manager.h", "cookies/cookie_creation_time_manager.h",
...@@ -50,27 +47,16 @@ source_set("net") { ...@@ -50,27 +47,16 @@ source_set("net") {
"cookies/system_cookie_store.mm", "cookies/system_cookie_store.mm",
"cookies/system_cookie_util.h", "cookies/system_cookie_util.h",
"cookies/system_cookie_util.mm", "cookies/system_cookie_util.mm",
"crn_http_protocol_handler.h",
"crn_http_protocol_handler.mm",
"crn_http_protocol_handler_proxy.h",
"crn_http_protocol_handler_proxy_with_client_thread.h",
"crn_http_protocol_handler_proxy_with_client_thread.mm",
"crn_http_url_response.h", "crn_http_url_response.h",
"crn_http_url_response.mm", "crn_http_url_response.mm",
"empty_nsurlcache.h", "empty_nsurlcache.h",
"empty_nsurlcache.mm", "empty_nsurlcache.mm",
"http_cache_helper.cc", "http_cache_helper.cc",
"http_cache_helper.h", "http_cache_helper.h",
"http_protocol_logging.h",
"http_protocol_logging.mm",
"http_response_headers_util.h", "http_response_headers_util.h",
"http_response_headers_util.mm", "http_response_headers_util.mm",
"nsurlrequest_util.h",
"nsurlrequest_util.mm",
"protocol_handler_util.h", "protocol_handler_util.h",
"protocol_handler_util.mm", "protocol_handler_util.mm",
"request_tracker.h",
"request_tracker.mm",
"url_scheme_util.h", "url_scheme_util.h",
"url_scheme_util.mm", "url_scheme_util.mm",
] ]
...@@ -80,6 +66,39 @@ source_set("net") { ...@@ -80,6 +66,39 @@ source_set("net") {
} }
} }
source_set("network_protocol") {
deps = [
":ios_net_buildflags",
":net",
"//base",
"//net",
"//url:buildflags",
]
configs += [ "//build/config/compiler:enable_arc" ]
sources = [
"chunked_data_stream_uploader.cc",
"chunked_data_stream_uploader.h",
"clients/crn_network_client_protocol.h",
"crn_http_protocol_handler.h",
"crn_http_protocol_handler.mm",
"crn_http_protocol_handler_proxy.h",
"crn_http_protocol_handler_proxy_with_client_thread.h",
"crn_http_protocol_handler_proxy_with_client_thread.mm",
"http_protocol_logging.h",
"http_protocol_logging.mm",
"nsurlrequest_util.h",
"nsurlrequest_util.mm",
"request_tracker.h",
"request_tracker.mm",
]
if (!use_platform_icu_alternatives) {
deps += [ "//base:i18n" ]
}
}
source_set("test_support") { source_set("test_support") {
testonly = true testonly = true
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
...@@ -103,6 +122,7 @@ test("ios_net_unittests") { ...@@ -103,6 +122,7 @@ test("ios_net_unittests") {
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
deps = [ deps = [
":net", ":net",
":network_protocol",
":test_support", ":test_support",
"//base", "//base",
"//base/test:run_all_unittests", "//base/test:run_all_unittests",
......
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