Skip to content

Commit 680c214

Browse files
mmenkeCommit Bot
mmenke
authored and
Commit Bot
committed
Move NetworkService mojom files to content/public/common.
This will allow chrome/ code to use the NetworkService's API, both to configure the NetworkService and to issue requests. Also moves some associated tyemaps and class files over. BUG=736906 CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation Review-Url: https://codereview.chromium.org/2964503003 Cr-Commit-Position: refs/heads/master@{#484325}
1 parent 9bd16d0 commit 680c214

File tree

89 files changed

+169
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+169
-135
lines changed

‎content/browser/appcache/appcache_subresource_url_factory.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include "content/browser/appcache/appcache_url_loader_job.h"
1111
#include "content/browser/appcache/appcache_url_loader_request.h"
1212
#include "content/browser/url_loader_factory_getter.h"
13-
#include "content/common/url_loader_factory.mojom.h"
1413
#include "content/public/browser/browser_thread.h"
1514
#include "content/public/common/resource_request.h"
15+
#include "content/public/common/url_loader_factory.mojom.h"
1616
#include "mojo/public/cpp/bindings/binding.h"
1717
#include "mojo/public/cpp/bindings/binding_set.h"
1818
#include "mojo/public/cpp/bindings/interface_ptr.h"

‎content/browser/appcache/appcache_subresource_url_factory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define CONTENT_BROWSER_APPCACHE_APPCACHE_SUBRESOURCE_URL_FACTORY_H_
77

88
#include "base/memory/ref_counted.h"
9-
#include "content/common/url_loader_factory.mojom.h"
9+
#include "content/public/common/url_loader_factory.mojom.h"
1010
#include "mojo/public/cpp/bindings/binding.h"
1111
#include "net/traffic_annotation/network_traffic_annotation.h"
1212
#include "url/gurl.h"

‎content/browser/appcache/appcache_url_loader_job.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "content/browser/appcache/appcache_storage.h"
1717
#include "content/browser/loader/url_loader_request_handler.h"
1818
#include "content/common/content_export.h"
19-
#include "content/common/url_loader.mojom.h"
2019
#include "content/public/common/resource_request.h"
20+
#include "content/public/common/url_loader.mojom.h"
2121
#include "mojo/public/cpp/bindings/binding.h"
2222
#include "mojo/public/cpp/system/data_pipe.h"
2323

‎content/browser/blob_storage/blob_internals_url_loader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef CONTENT_BROWSER_BLOB_STORAGE_BLOB_INTERNALS_URL_LOADER_H_
66
#define CONTENT_BROWSER_BLOB_STORAGE_BLOB_INTERNALS_URL_LOADER_H_
77

8-
#include "content/common/url_loader.mojom.h"
8+
#include "content/public/common/url_loader.mojom.h"
99

1010
namespace content {
1111
class ChromeBlobStorageContext;

‎content/browser/blob_storage/blob_url_loader_factory.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
1414
#include "content/browser/storage_partition_impl.h"
1515
#include "content/common/net_adapters.h"
16-
#include "content/common/url_loader.mojom.h"
1716
#include "content/public/browser/browser_thread.h"
17+
#include "content/public/common/url_loader.mojom.h"
1818
#include "mojo/public/cpp/system/simple_watcher.h"
1919
#include "net/base/io_buffer.h"
2020
#include "net/http/http_byte_range.h"

‎content/browser/blob_storage/blob_url_loader_factory.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include "base/macros.h"
1010
#include "base/memory/ref_counted.h"
1111
#include "content/common/content_export.h"
12-
#include "content/common/url_loader_factory.mojom.h"
1312
#include "content/public/browser/browser_thread.h"
13+
#include "content/public/common/url_loader_factory.mojom.h"
1414
#include "mojo/public/cpp/bindings/binding_set.h"
1515

1616
namespace storage {

‎content/browser/devtools/protocol/network_handler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "content/browser/frame_host/frame_tree_node.h"
2222
#include "content/browser/frame_host/render_frame_host_impl.h"
2323
#include "content/common/navigation_params.h"
24-
#include "content/common/resource_request_completion_status.h"
2524
#include "content/public/browser/browser_context.h"
2625
#include "content/public/browser/browser_thread.h"
2726
#include "content/public/browser/browsing_data_remover.h"
@@ -35,6 +34,7 @@
3534
#include "content/public/common/content_switches.h"
3635
#include "content/public/common/resource_devtools_info.h"
3736
#include "content/public/common/resource_request.h"
37+
#include "content/public/common/resource_request_completion_status.h"
3838
#include "content/public/common/resource_response.h"
3939
#include "net/base/net_errors.h"
4040
#include "net/base/upload_bytes_element_reader.h"

‎content/browser/frame_host/navigator_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "content/common/navigation_params.h"
3030
#include "content/common/page_messages.h"
3131
#include "content/common/site_isolation_policy.h"
32-
#include "content/common/url_loader_factory.mojom.h"
3332
#include "content/common/view_messages.h"
3433
#include "content/public/browser/browser_context.h"
3534
#include "content/public/browser/content_browser_client.h"
@@ -45,6 +44,7 @@
4544
#include "content/public/common/content_client.h"
4645
#include "content/public/common/content_constants.h"
4746
#include "content/public/common/resource_response.h"
47+
#include "content/public/common/url_loader_factory.mojom.h"
4848
#include "net/base/net_errors.h"
4949
#include "url/gurl.h"
5050
#include "url/url_util.h"

‎content/browser/frame_host/render_frame_host_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
#include "content/common/frame_replication_state.h"
4242
#include "content/common/image_downloader/image_downloader.mojom.h"
4343
#include "content/common/navigation_params.h"
44-
#include "content/common/url_loader_factory.mojom.h"
4544
#include "content/public/browser/render_frame_host.h"
4645
#include "content/public/common/javascript_dialog_type.h"
4746
#include "content/public/common/previews_state.h"
47+
#include "content/public/common/url_loader_factory.mojom.h"
4848
#include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
4949
#include "media/mojo/interfaces/interface_factory.mojom.h"
5050
#include "mojo/public/cpp/bindings/binding_set.h"

‎content/browser/histogram_internals_url_loader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef CONTENT_BROWSER_HISTOGRAM_INTERNALS_URL_LOADER_H_
66
#define CONTENT_BROWSER_HISTOGRAM_INTERNALS_URL_LOADER_H_
77

8-
#include "content/common/url_loader.mojom.h"
8+
#include "content/public/common/url_loader.mojom.h"
99

1010
namespace content {
1111

‎content/browser/loader/DEPS

+18-18
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ specific_include_rules = {
2929

3030
# TODO: To be replaced by mojo.
3131
"+content/common/resource_messages.h",
32-
"+content/common/resource_request_completion_status.h",
3332
"+content/common/view_messages.h",
33+
"+content/public/common/resource_request_completion_status.h",
3434
],
3535
"downloaded_temp_file_impl\.(cc|h)": [
3636
"-content",
3737
"+content/browser/loader/downloaded_temp_file_impl.h",
3838
"+content/browser/loader/resource_dispatcher_host_impl.h",
3939
"+content/common/content_export.h",
40-
"+content/common/url_loader_factory.mojom.h"
40+
"+content/public/common/url_loader_factory.mojom.h"
4141
],
4242
"resource_buffer.*\.(cc|h)": [
4343
"-content",
@@ -67,11 +67,11 @@ specific_include_rules = {
6767
"+content/browser/loader/resource_scheduler.h",
6868
"+content/browser/loader/upload_progress_tracker.h",
6969
"+content/common/content_export.h",
70-
"+content/common/resource_request_completion_status.h",
71-
"+content/common/url_loader.mojom.h",
7270
"+content/public/browser/global_request_id.h",
71+
"+content/public/common/resource_request_completion_status.h",
7372
"+content/public/common/resource_response.h",
7473
"+content/public/common/resource_type.h",
74+
"+content/public/common/url_loader.mojom.h",
7575
],
7676
"mojo_async_resource_handler_unittest\.cc": [
7777
"-content",
@@ -82,9 +82,6 @@ specific_include_rules = {
8282
"+content/browser/loader/resource_dispatcher_host_impl.h",
8383
"+content/browser/loader/resource_request_info_impl.h",
8484
"+content/browser/loader/resource_scheduler.h",
85-
"+content/common/resource_request_completion_status.h",
86-
"+content/common/url_loader.mojom.h",
87-
"+content/common/url_loader_factory.mojom.h",
8885
"+content/public/browser/appcache_service.h",
8986
"+content/public/browser/navigation_data.h",
9087
"+content/public/browser/resource_context.h",
@@ -93,8 +90,11 @@ specific_include_rules = {
9390
"+content/public/browser/stream_info.h",
9491
"+content/public/common/previews_state.h",
9592
"+content/public/common/resource_request.h",
93+
"+content/public/common/resource_request_completion_status.h",
9694
"+content/public/common/resource_response.h",
9795
"+content/public/common/resource_type.h",
96+
"+content/public/common/url_loader.mojom.h",
97+
"+content/public/common/url_loader_factory.mojom.h",
9898
"+content/public/test/test_browser_context.h",
9999
"+content/public/test/test_browser_thread_bundle.h",
100100
],
@@ -127,14 +127,14 @@ specific_include_rules = {
127127
"+content/browser/loader/throttling_resource_handler.h",
128128
"+content/browser/loader/wake_lock_resource_throttle.h",
129129
"+content/common/resource_request_body.h",
130-
"+content/common/url_loader.mojom.h",
131130
"+content/public/browser/global_request_id.h",
132131
"+content/public/browser/resource_dispatcher_host.h",
133132
"+content/public/browser/resource_dispatcher_host_delegate.h",
134133
"+content/public/browser/resource_request_info.h",
135134
"+content/public/browser/resource_throttle.h",
136135
"+content/public/common/previews_state.h",
137136
"+content/public/common/resource_request_body.h",
137+
"+content/public/common/url_loader.mojom.h",
138138

139139
# TODO: These all have to be removed.
140140
"+content/browser/appcache/appcache_interceptor.h",
@@ -180,9 +180,9 @@ specific_include_rules = {
180180

181181
# TODO: To be replaced by mojo.
182182
"+content/common/resource_messages.h",
183-
"+content/common/resource_request_completion_status.h",
184183
"+content/common/view_messages.h",
185184
"+content/public/common/resource_request.h",
185+
"+content/public/common/resource_request_completion_status.h",
186186
],
187187
"resource_handler\.(cc|h)": [
188188
"-content",
@@ -230,13 +230,13 @@ specific_include_rules = {
230230
"+content/browser/loader/resource_request_info_impl.h",
231231
"+content/browser/loader/resource_requester_info.h",
232232
"+content/common/content_export.h",
233-
"+content/common/url_loader.mojom.h",
234233
"+content/public/browser/global_request_id.h",
235234
"+content/public/browser/resource_request_info.h",
236235
"+content/public/common/previews_state.h",
237236
"+content/public/common/referrer.h",
238237
"+content/public/common/resource_request_body.h",
239238
"+content/public/common/resource_type.h",
239+
"+content/public/common/url_loader.mojom.h",
240240

241241
# TODO: these all have to be removed.
242242
"+content/browser/frame_host/frame_tree_node.h",
@@ -304,10 +304,10 @@ specific_include_rules = {
304304
"test_url_loader_client\.(cc|h)": [
305305
"-content",
306306
"+content/browser/loader/test_url_loader_client.h",
307-
"+content/common/resource_request_completion_status.h",
308-
"+content/common/url_loader.mojom.h",
309-
"+content/common/url_loader_factory.mojom.h",
307+
"+content/public/common/resource_request_completion_status.h",
310308
"+content/public/common/resource_response.h",
309+
"+content/public/common/url_loader.mojom.h",
310+
"+content/public/common/url_loader_factory.mojom.h",
311311
],
312312
"upload_progress_tracker\.(cc|h)": [
313313
"-content",
@@ -320,9 +320,9 @@ specific_include_rules = {
320320
"+content/browser/loader/resource_requester_info.h",
321321
"+content/browser/loader/url_loader_factory_impl.h",
322322
"+content/common/content_export.h",
323-
"+content/common/url_loader.mojom.h",
324-
"+content/common/url_loader_factory.mojom.h",
325323
"+content/public/common/resource_request.h",
324+
"+content/public/common/url_loader.mojom.h",
325+
"+content/public/common/url_loader_factory.mojom.h",
326326
],
327327
"url_loader_factory_impl_unittest\.cc": [
328328
"-content",
@@ -334,13 +334,13 @@ specific_include_rules = {
334334
"+content/browser/loader/resource_request_info_impl.h",
335335
"+content/browser/loader/url_loader_factory_impl.h",
336336
"+content/browser/loader_delegate_impl.h",
337-
"+content/common/resource_request_completion_status.h",
338-
"+content/common/url_loader.mojom.h",
339-
"+content/common/url_loader_factory.mojom.h",
340337
"+content/public/browser/resource_context.h",
341338
"+content/public/browser/resource_dispatcher_host_delegate.h",
342339
"+content/public/common/content_paths.h",
343340
"+content/public/common/resource_request.h",
341+
"+content/public/common/resource_request_completion_status.h",
342+
"+content/public/common/url_loader.mojom.h",
343+
"+content/public/common/url_loader_factory.mojom.h",
344344
"+content/public/test/test_browser_context.h",
345345
"+content/public/test/test_browser_thread_bundle.h",
346346

‎content/browser/loader/async_resource_handler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include "content/browser/loader/resource_request_info_impl.h"
2626
#include "content/browser/loader/upload_progress_tracker.h"
2727
#include "content/common/resource_messages.h"
28-
#include "content/common/resource_request_completion_status.h"
2928
#include "content/common/view_messages.h"
29+
#include "content/public/common/resource_request_completion_status.h"
3030
#include "content/public/common/resource_response.h"
3131
#include "ipc/ipc_message_macros.h"
3232
#include "net/base/io_buffer.h"

‎content/browser/loader/downloaded_temp_file_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "base/macros.h"
99
#include "content/common/content_export.h"
10-
#include "content/common/url_loader_factory.mojom.h"
10+
#include "content/public/common/url_loader_factory.mojom.h"
1111

1212
namespace content {
1313

‎content/browser/loader/mojo_async_resource_handler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "content/browser/loader/resource_request_info_impl.h"
2424
#include "content/browser/loader/resource_scheduler.h"
2525
#include "content/browser/loader/upload_progress_tracker.h"
26-
#include "content/common/resource_request_completion_status.h"
2726
#include "content/public/browser/global_request_id.h"
27+
#include "content/public/common/resource_request_completion_status.h"
2828
#include "content/public/common/resource_response.h"
2929
#include "mojo/public/c/system/data_pipe.h"
3030
#include "mojo/public/cpp/bindings/message.h"

‎content/browser/loader/mojo_async_resource_handler.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "content/browser/loader/resource_handler.h"
1717
#include "content/browser/loader/upload_progress_tracker.h"
1818
#include "content/common/content_export.h"
19-
#include "content/common/url_loader.mojom.h"
2019
#include "content/public/common/resource_type.h"
20+
#include "content/public/common/url_loader.mojom.h"
2121
#include "mojo/public/cpp/bindings/associated_binding.h"
2222
#include "mojo/public/cpp/system/data_pipe.h"
2323
#include "mojo/public/cpp/system/simple_watcher.h"

‎content/browser/loader/mojo_async_resource_handler_unittest.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@
2424
#include "content/browser/loader/resource_request_info_impl.h"
2525
#include "content/browser/loader/resource_scheduler.h"
2626
#include "content/browser/loader/test_url_loader_client.h"
27-
#include "content/common/resource_request_completion_status.h"
28-
#include "content/common/url_loader.mojom.h"
29-
#include "content/common/url_loader_factory.mojom.h"
3027
#include "content/public/browser/appcache_service.h"
3128
#include "content/public/browser/navigation_data.h"
3229
#include "content/public/browser/resource_context.h"
3330
#include "content/public/browser/resource_dispatcher_host_delegate.h"
3431
#include "content/public/browser/resource_throttle.h"
3532
#include "content/public/browser/stream_info.h"
3633
#include "content/public/common/previews_state.h"
34+
#include "content/public/common/resource_request_completion_status.h"
3735
#include "content/public/common/resource_response.h"
3836
#include "content/public/common/resource_type.h"
37+
#include "content/public/common/url_loader.mojom.h"
38+
#include "content/public/common/url_loader_factory.mojom.h"
3939
#include "content/public/test/test_browser_context.h"
4040
#include "content/public/test/test_browser_thread_bundle.h"
4141
#include "mojo/public/c/system/data_pipe.h"

‎content/browser/loader/navigation_url_loader_delegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "base/macros.h"
1111
#include "base/memory/ref_counted.h"
1212
#include "content/common/content_export.h"
13-
#include "content/common/url_loader_factory.mojom.h"
13+
#include "content/public/common/url_loader_factory.mojom.h"
1414
#include "mojo/public/cpp/system/data_pipe.h"
1515

1616
namespace net {

‎content/browser/loader/navigation_url_loader_network_service.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "content/browser/webui/url_data_manager_backend.h"
2828
#include "content/browser/webui/web_ui_url_loader_factory.h"
2929
#include "content/common/throttling_url_loader.h"
30-
#include "content/common/url_loader_factory.mojom.h"
3130
#include "content/public/browser/browser_context.h"
3231
#include "content/public/browser/browser_thread.h"
3332
#include "content/public/browser/content_browser_client.h"
@@ -38,6 +37,7 @@
3837
#include "content/public/browser/stream_handle.h"
3938
#include "content/public/common/referrer.h"
4039
#include "content/public/common/url_constants.h"
40+
#include "content/public/common/url_loader_factory.mojom.h"
4141
#include "net/base/load_flags.h"
4242
#include "net/traffic_annotation/network_traffic_annotation.h"
4343
#include "net/url_request/url_request_context.h"

‎content/browser/loader/navigation_url_loader_network_service.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include "base/macros.h"
99
#include "base/memory/weak_ptr.h"
1010
#include "content/browser/loader/navigation_url_loader.h"
11-
#include "content/common/url_loader.mojom.h"
1211
#include "content/public/browser/ssl_status.h"
12+
#include "content/public/common/url_loader.mojom.h"
1313

1414
namespace net {
1515
struct RedirectInfo;

‎content/browser/loader/resource_dispatcher_host_impl.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
#include "content/browser/streams/stream_registry.h"
7575
#include "content/common/net/url_request_service_worker_data.h"
7676
#include "content/common/resource_messages.h"
77-
#include "content/common/resource_request_completion_status.h"
7877
#include "content/common/site_isolation_policy.h"
7978
#include "content/common/view_messages.h"
8079
#include "content/public/browser/browser_thread.h"
@@ -91,6 +90,7 @@
9190
#include "content/public/common/content_switches.h"
9291
#include "content/public/common/resource_request.h"
9392
#include "content/public/common/resource_request_body.h"
93+
#include "content/public/common/resource_request_completion_status.h"
9494
#include "ipc/ipc_message_macros.h"
9595
#include "ipc/ipc_message_start.h"
9696
#include "net/base/auth.h"

‎content/browser/loader/resource_dispatcher_host_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
#include "content/browser/loader/global_routing_id.h"
3131
#include "content/browser/loader/resource_loader_delegate.h"
3232
#include "content/common/content_export.h"
33-
#include "content/common/url_loader.mojom.h"
3433
#include "content/public/browser/global_request_id.h"
3534
#include "content/public/browser/resource_dispatcher_host.h"
3635
#include "content/public/browser/resource_request_info.h"
3736
#include "content/public/browser/stream_handle.h"
3837
#include "content/public/common/previews_state.h"
3938
#include "content/public/common/request_context_type.h"
4039
#include "content/public/common/resource_type.h"
40+
#include "content/public/common/url_loader.mojom.h"
4141
#include "ipc/ipc_message.h"
4242
#include "net/base/load_states.h"
4343
#include "net/base/request_priority.h"

‎content/browser/loader/resource_message_filter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
#include "base/sequenced_task_runner_helpers.h"
1515
#include "base/single_thread_task_runner.h"
1616
#include "content/common/content_export.h"
17-
#include "content/common/url_loader_factory.mojom.h"
1817
#include "content/public/browser/browser_associated_interface.h"
1918
#include "content/public/browser/browser_message_filter.h"
2019
#include "content/public/common/resource_type.h"
20+
#include "content/public/common/url_loader_factory.mojom.h"
2121
#include "net/traffic_annotation/network_traffic_annotation.h"
2222

2323
namespace storage {

0 commit comments

Comments
 (0)