| OLD | NEW |
| 1 # The core loading code in this directory is being transitioned into a separate | 1 # The core loading code in this directory is being transitioned into a separate |
| 2 # Mojo networking service. See http://crbug.com/598073. The first stage is to | 2 # Mojo networking service. See http://crbug.com/598073. The first stage is to |
| 3 # decouple the code that will be moved from the rest of content. These rules | 3 # decouple the code that will be moved from the rest of content. These rules |
| 4 # help ensure that we don't add more includes, and can progressively reduce the | 4 # help ensure that we don't add more includes, and can progressively reduce the |
| 5 # code's dependencies. | 5 # code's dependencies. |
| 6 # | 6 # |
| 7 # For each file, the first section shows includes that are allowed (i.e. because | 7 # For each file, the first section shows includes that are allowed (i.e. because |
| 8 # they are for files that will be moving as well). The second section, separated | 8 # they are for files that will be moving as well). The second section, separated |
| 9 # by a comment, lists files that we will have to decouple. | 9 # by a comment, lists files that we will have to decouple. |
| 10 specific_include_rules = { | 10 specific_include_rules = { |
| 11 "async_resource_handler\.(cc|h)": [ | 11 "async_resource_handler\.(cc|h)": [ |
| 12 "-content", | 12 "-content", |
| 13 "+content/browser/loader/async_resource_handler.h", | 13 "+content/browser/loader/async_resource_handler.h", |
| 14 "+content/browser/loader/downloaded_temp_file_impl.h", | 14 "+content/browser/loader/downloaded_temp_file_impl.h", |
| 15 "+content/browser/loader/netlog_observer.h", | 15 "+content/browser/loader/netlog_observer.h", |
| 16 "+content/browser/loader/resource_buffer.h", | 16 "+content/browser/loader/resource_buffer.h", |
| 17 "+content/browser/loader/resource_controller.h", |
| 17 "+content/browser/loader/resource_dispatcher_host_impl.h", | 18 "+content/browser/loader/resource_dispatcher_host_impl.h", |
| 18 "+content/browser/loader/resource_handler.h", | 19 "+content/browser/loader/resource_handler.h", |
| 19 "+content/browser/loader/resource_message_delegate.h", | 20 "+content/browser/loader/resource_message_delegate.h", |
| 20 "+content/browser/loader/resource_message_filter.h", | 21 "+content/browser/loader/resource_message_filter.h", |
| 21 "+content/browser/loader/resource_request_info_impl.h", | 22 "+content/browser/loader/resource_request_info_impl.h", |
| 22 "+content/common/content_export.h", | 23 "+content/common/content_export.h", |
| 23 "+content/public/browser/resource_controller.h", | |
| 24 "+content/public/browser/resource_dispatcher_host_delegate.h", | 24 "+content/public/browser/resource_dispatcher_host_delegate.h", |
| 25 "+content/public/common/resource_response.h", | 25 "+content/public/common/resource_response.h", |
| 26 | 26 |
| 27 # TODO: these all have to be removed. | 27 # TODO: these all have to be removed. |
| 28 "+content/public/common/content_features.h", | 28 "+content/public/common/content_features.h", |
| 29 | 29 |
| 30 # TODO: To be replaced by mojo. | 30 # TODO: To be replaced by mojo. |
| 31 "+content/common/resource_messages.h", | 31 "+content/common/resource_messages.h", |
| 32 "+content/common/resource_request_completion_status.h", | 32 "+content/common/resource_request_completion_status.h", |
| 33 "+content/common/view_messages.h", | 33 "+content/common/view_messages.h", |
| 34 ], | 34 ], |
| 35 "async_revalidation_driver\.(cc|h)": [ | 35 "async_revalidation_driver\.(cc|h)": [ |
| 36 "-content", | 36 "-content", |
| 37 "+content/browser/loader/async_revalidation_driver.h", | 37 "+content/browser/loader/async_revalidation_driver.h", |
| 38 "+content/common/content_export.h", | 38 "+content/common/content_export.h", |
| 39 "+content/public/browser/resource_controller.h", | |
| 40 "+content/public/browser/resource_throttle.h", | 39 "+content/public/browser/resource_throttle.h", |
| 41 ], | 40 ], |
| 42 "async_revalidation_driver_unittest\.cc": [ | 41 "async_revalidation_driver_unittest\.cc": [ |
| 43 "-content", | 42 "-content", |
| 44 "+content/browser/loader/async_revalidation_driver.h", | 43 "+content/browser/loader/async_revalidation_driver.h", |
| 45 | 44 |
| 46 # TODO: these all have to be removed. | 45 # TODO: these all have to be removed. |
| 47 # Only one test needs these, so that can stay in content while the other | 46 # Only one test needs these, so that can stay in content while the other |
| 48 # tests move. | 47 # tests move. |
| 49 "+content/public/browser/client_certificate_delegate.h", | 48 "+content/public/browser/client_certificate_delegate.h", |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 "+content/browser/loader/resource_handler.h", | 83 "+content/browser/loader/resource_handler.h", |
| 85 "+content/common/content_export.h", | 84 "+content/common/content_export.h", |
| 86 ], | 85 ], |
| 87 "mojo_async_resource_handler\.(cc|h)": [ | 86 "mojo_async_resource_handler\.(cc|h)": [ |
| 88 "-content", | 87 "-content", |
| 89 "+content/browser/loader/async_resource_handler.h", | 88 "+content/browser/loader/async_resource_handler.h", |
| 90 "+content/browser/loader/downloaded_temp_file_impl.h", | 89 "+content/browser/loader/downloaded_temp_file_impl.h", |
| 91 "+content/browser/loader/mojo_async_resource_handler.h", | 90 "+content/browser/loader/mojo_async_resource_handler.h", |
| 92 "+content/browser/loader/test_url_loader_client.h", | 91 "+content/browser/loader/test_url_loader_client.h", |
| 93 "+content/browser/loader/netlog_observer.h", | 92 "+content/browser/loader/netlog_observer.h", |
| 93 "+content/browser/loader/resource_controller.h", |
| 94 "+content/browser/loader/resource_dispatcher_host_impl.h", | 94 "+content/browser/loader/resource_dispatcher_host_impl.h", |
| 95 "+content/browser/loader/resource_handler.h", | 95 "+content/browser/loader/resource_handler.h", |
| 96 "+content/browser/loader/resource_request_info_impl.h", | 96 "+content/browser/loader/resource_request_info_impl.h", |
| 97 "+content/common/content_export.h", | 97 "+content/common/content_export.h", |
| 98 "+content/common/resource_request_completion_status.h", | 98 "+content/common/resource_request_completion_status.h", |
| 99 "+content/public/browser/global_request_id.h", | 99 "+content/public/browser/global_request_id.h", |
| 100 "+content/public/browser/resource_controller.h", | |
| 101 "+content/public/browser/resource_dispatcher_host_delegate.h", | 100 "+content/public/browser/resource_dispatcher_host_delegate.h", |
| 102 "+content/public/common/resource_response.h", | 101 "+content/public/common/resource_response.h", |
| 103 "+content/common/url_loader.mojom.h", | 102 "+content/common/url_loader.mojom.h", |
| 104 ], | 103 ], |
| 105 "mojo_async_resource_handler_unittest\.cc": [ | 104 "mojo_async_resource_handler_unittest\.cc": [ |
| 106 "-content", | 105 "-content", |
| 107 "+content/browser/loader/mojo_async_resource_handler.h", | 106 "+content/browser/loader/mojo_async_resource_handler.h", |
| 108 "+content/browser/loader/test_url_loader_client.h", | 107 "+content/browser/loader/test_url_loader_client.h", |
| 109 "+content/public/browser/navigation_data.h", | 108 "+content/public/browser/navigation_data.h", |
| 109 "+content/browser/loader/resource_controller.h", |
| 110 "+content/browser/loader/resource_dispatcher_host_impl.h", | 110 "+content/browser/loader/resource_dispatcher_host_impl.h", |
| 111 "+content/browser/loader/resource_request_info_impl.h", | 111 "+content/browser/loader/resource_request_info_impl.h", |
| 112 "+content/common/resource_request.h", | 112 "+content/common/resource_request.h", |
| 113 "+content/common/resource_request_completion_status.h", | 113 "+content/common/resource_request_completion_status.h", |
| 114 "+content/common/url_loader.mojom.h", | 114 "+content/common/url_loader.mojom.h", |
| 115 "+content/public/browser/appcache_service.h", | 115 "+content/public/browser/appcache_service.h", |
| 116 "+content/public/browser/resource_context.h", | 116 "+content/public/browser/resource_context.h", |
| 117 "+content/public/browser/resource_controller.h", | |
| 118 "+content/public/browser/resource_dispatcher_host_delegate.h", | 117 "+content/public/browser/resource_dispatcher_host_delegate.h", |
| 119 "+content/public/browser/resource_throttle.h", | 118 "+content/public/browser/resource_throttle.h", |
| 120 "+content/public/browser/stream_info.h", | 119 "+content/public/browser/stream_info.h", |
| 121 "+content/public/common/resource_response.h", | 120 "+content/public/common/resource_response.h", |
| 122 "+content/public/common/resource_type.h", | 121 "+content/public/common/resource_type.h", |
| 123 "+content/public/test/test_browser_context.h", | 122 "+content/public/test/test_browser_context.h", |
| 124 "+content/public/test/test_browser_thread_bundle.h", | 123 "+content/public/test/test_browser_thread_bundle.h", |
| 125 ], | 124 ], |
| 126 "netlog_observer\.(cc|h)": [ | 125 "netlog_observer\.(cc|h)": [ |
| 127 "-content", | 126 "-content", |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 "+content/common/view_messages.h", | 218 "+content/common/view_messages.h", |
| 220 ], | 219 ], |
| 221 "resource_handler\.(cc|h)": [ | 220 "resource_handler\.(cc|h)": [ |
| 222 "-content", | 221 "-content", |
| 223 "+content/browser/loader/resource_handler.h", | 222 "+content/browser/loader/resource_handler.h", |
| 224 "+content/browser/loader/resource_request_info_impl.h", | 223 "+content/browser/loader/resource_request_info_impl.h", |
| 225 "+content/common/content_export.h", | 224 "+content/common/content_export.h", |
| 226 ], | 225 ], |
| 227 "resource_loader\.(cc|h)": [ | 226 "resource_loader\.(cc|h)": [ |
| 228 "-content", | 227 "-content", |
| 228 "+content/browser/loader/resource_controller.h", |
| 229 "+content/browser/loader/resource_handler.h", | 229 "+content/browser/loader/resource_handler.h", |
| 230 "+content/browser/loader/resource_loader.h", | 230 "+content/browser/loader/resource_loader.h", |
| 231 "+content/browser/loader/resource_loader_delegate.h", | 231 "+content/browser/loader/resource_loader_delegate.h", |
| 232 "+content/browser/loader/resource_request_info_impl.h", | 232 "+content/browser/loader/resource_request_info_impl.h", |
| 233 "+content/browser/ssl/ssl_client_auth_handler.h", | 233 "+content/browser/ssl/ssl_client_auth_handler.h", |
| 234 "+content/browser/ssl/ssl_error_handler.h", | 234 "+content/browser/ssl/ssl_error_handler.h", |
| 235 "+content/common/content_export.h", | 235 "+content/common/content_export.h", |
| 236 "+content/public/browser/resource_controller.h", | |
| 237 "+content/public/browser/resource_dispatcher_host_login_delegate.h", | 236 "+content/public/browser/resource_dispatcher_host_login_delegate.h", |
| 238 "+content/public/common/browser_side_navigation_policy.h", | 237 "+content/public/common/browser_side_navigation_policy.h", |
| 239 "+content/public/common/resource_response.h", | 238 "+content/public/common/resource_response.h", |
| 240 "+content/public/common/resource_type.h", | 239 "+content/public/common/resource_type.h", |
| 241 | 240 |
| 242 # TODO: these all have to be removed. | 241 # TODO: these all have to be removed. |
| 243 "+content/browser/appcache/appcache_interceptor.h", | 242 "+content/browser/appcache/appcache_interceptor.h", |
| 244 "+content/browser/child_process_security_policy_impl.h", | 243 "+content/browser/child_process_security_policy_impl.h", |
| 245 "+content/browser/loader/cross_site_resource_handler.h", | 244 "+content/browser/loader/cross_site_resource_handler.h", |
| 246 "+content/browser/loader/detachable_resource_handler.h", | 245 "+content/browser/loader/detachable_resource_handler.h", |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 "+content/public/browser/resource_context.h", | 363 "+content/public/browser/resource_context.h", |
| 365 "+content/public/browser/resource_dispatcher_host_delegate.h", | 364 "+content/public/browser/resource_dispatcher_host_delegate.h", |
| 366 "+content/public/common/content_paths.h", | 365 "+content/public/common/content_paths.h", |
| 367 "+content/public/test/test_browser_context.h", | 366 "+content/public/test/test_browser_context.h", |
| 368 "+content/public/test/test_browser_thread_bundle.h", | 367 "+content/public/test/test_browser_thread_bundle.h", |
| 369 | 368 |
| 370 #TODO: To be removed when PlzNavigate lands. | 369 #TODO: To be removed when PlzNavigate lands. |
| 371 "+content/browser/loader/navigation_resource_throttle.h" | 370 "+content/browser/loader/navigation_resource_throttle.h" |
| 372 ], | 371 ], |
| 373 } | 372 } |
| OLD | NEW |