Unexport resource_controller.h

This is a follow up for https://codereview.chromium.org/2535723005/
suggested by mmenke@.

ResourceController is no longer used by any file outside of
content/browser/. Move it to content/browser/loader/.

BUG=646277
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Review-Url: https://codereview.chromium.org/2554273002
Cr-Commit-Position: refs/heads/master@{#436967}

content/browser/BUILD.gn

@@ -791,6 +791,7 @@ source_set("browser") {
     "loader/redirect_to_file_resource_handler.h",
     "loader/resource_buffer.cc",
     "loader/resource_buffer.h",
+    "loader/resource_controller.h",
     "loader/resource_dispatcher_host_impl.cc",
     "loader/resource_dispatcher_host_impl.h",
     "loader/resource_handler.cc",

content/browser/download/download_resource_handler.cc

@@ -17,13 +17,13 @@
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/frame_host/frame_tree_node.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
 #include "content/public/common/resource_response.h"

content/browser/frame_host/navigation_controller_impl_browsertest.cc

@@ -30,7 +30,6 @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_view_host.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_throttle.h"

content/browser/loader/DEPS

@@ -14,13 +14,13 @@ specific_include_rules = {
     "+content/browser/loader/downloaded_temp_file_impl.h",
     "+content/browser/loader/netlog_observer.h",
     "+content/browser/loader/resource_buffer.h",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_message_delegate.h",
     "+content/browser/loader/resource_message_filter.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/common/content_export.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/common/resource_response.h",
 
@@ -36,7 +36,6 @@ specific_include_rules = {
     "-content",
     "+content/browser/loader/async_revalidation_driver.h",
     "+content/common/content_export.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_throttle.h",
   ],
   "async_revalidation_driver_unittest\.cc": [
@@ -91,13 +90,13 @@ specific_include_rules = {
     "+content/browser/loader/mojo_async_resource_handler.h",
     "+content/browser/loader/test_url_loader_client.h",
     "+content/browser/loader/netlog_observer.h",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/common/content_export.h",
     "+content/common/resource_request_completion_status.h",
     "+content/public/browser/global_request_id.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/common/resource_response.h",
     "+content/common/url_loader.mojom.h",
@@ -107,14 +106,14 @@ specific_include_rules = {
     "+content/browser/loader/mojo_async_resource_handler.h",
     "+content/browser/loader/test_url_loader_client.h",
     "+content/public/browser/navigation_data.h",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_dispatcher_host_impl.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/common/resource_request.h",
     "+content/common/resource_request_completion_status.h",
     "+content/common/url_loader.mojom.h",
     "+content/public/browser/appcache_service.h",
     "+content/public/browser/resource_context.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_dispatcher_host_delegate.h",
     "+content/public/browser/resource_throttle.h",
     "+content/public/browser/stream_info.h",
@@ -226,14 +225,14 @@ specific_include_rules = {
   ],
   "resource_loader\.(cc|h)": [
     "-content",
+    "+content/browser/loader/resource_controller.h",
     "+content/browser/loader/resource_handler.h",
     "+content/browser/loader/resource_loader.h",
     "+content/browser/loader/resource_loader_delegate.h",
     "+content/browser/loader/resource_request_info_impl.h",
     "+content/browser/ssl/ssl_client_auth_handler.h",
     "+content/browser/ssl/ssl_error_handler.h",
     "+content/common/content_export.h",
-    "+content/public/browser/resource_controller.h",
     "+content/public/browser/resource_dispatcher_host_login_delegate.h",
     "+content/public/common/browser_side_navigation_policy.h",
     "+content/public/common/resource_response.h",

content/browser/loader/async_resource_handler.cc

@@ -19,13 +19,13 @@
 #include "base/time/time.h"
 #include "content/browser/loader/netlog_observer.h"
 #include "content/browser/loader/resource_buffer.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/common/view_messages.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/resource_response.h"

content/browser/loader/detachable_resource_handler.h

@@ -12,8 +12,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_handler.h"
-#include "content/public/browser/resource_controller.h"
 
 namespace net {
 class IOBuffer;

content/browser/loader/intercepting_resource_handler.h

@@ -12,9 +12,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/loader/layered_resource_handler.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_handler.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/resource_controller.h"
 #include "net/base/io_buffer.h"
 #include "net/url_request/url_request_status.h"
 

content/browser/loader/intercepting_resource_handler_unittest.cc

@@ -16,8 +16,8 @@
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/test_resource_handler.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/webplugininfo.h"

content/browser/loader/mime_sniffing_resource_handler.h

@@ -11,8 +11,8 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/loader/layered_resource_handler.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/common/request_context_type.h"
 #include "ppapi/features/features.h"
 

content/browser/loader/mime_sniffing_resource_handler_unittest.cc

@@ -16,9 +16,9 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/loader/intercepting_resource_handler.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/test_resource_handler.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/resource_response.h"

content/browser/loader/mojo_async_resource_handler.cc

@@ -14,11 +14,11 @@
 #include "base/time/time.h"
 #include "content/browser/loader/downloaded_temp_file_impl.h"
 #include "content/browser/loader/netlog_observer.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/common/resource_request_completion_status.h"
 #include "content/public/browser/global_request_id.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/common/resource_response.h"
 #include "mojo/public/c/system/data_pipe.h"

content/browser/loader/mojo_async_resource_handler_unittest.cc

@@ -15,6 +15,7 @@
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader/test_url_loader_client.h"
@@ -23,7 +24,6 @@
 #include "content/public/browser/appcache_service.h"
 #include "content/public/browser/navigation_data.h"
 #include "content/public/browser/resource_context.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/resource_throttle.h"
 #include "content/public/browser/stream_info.h"

content/browser/loader/navigation_resource_handler.cc

@@ -9,13 +9,13 @@
 #include "base/logging.h"
 #include "content/browser/loader/navigation_url_loader_impl_core.h"
 #include "content/browser/loader/netlog_observer.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_context.h"
 #include "content/public/browser/navigation_data.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 #include "content/public/browser/ssl_status.h"
 #include "content/public/browser/stream_handle.h"

content/browser/loader/redirect_to_file_resource_handler.cc

@@ -10,9 +10,9 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/threading/thread_restrictions.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader/temporary_file_stream.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"

content/public/browser/resource_controller.h → content/browser/loader/resource_controller.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 CONTENT_PUBLIC_BROWSER_RESOURCE_CONTROLLER_H_
-#define CONTENT_PUBLIC_BROWSER_RESOURCE_CONTROLLER_H_
+#ifndef CONTENT_BROWSER_LOADER_RESOURCE_CONTROLLER_H_
+#define CONTENT_BROWSER_LOADER_RESOURCE_CONTROLLER_H_
 
 #include "content/common/content_export.h"
 
@@ -20,10 +20,11 @@ class CONTENT_EXPORT ResourceController {
   virtual void CancelAndIgnore() = 0;
   virtual void CancelWithError(int error_code) = 0;
   virtual void Resume() = 0;
+
  protected:
   virtual ~ResourceController() {}
 };
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_RESOURCE_CONTROLLER_H_
+#endif  // CONTENT_BROWSER_LOADER_RESOURCE_CONTROLLER_H_

content/browser/loader/resource_loader.h

@@ -11,10 +11,10 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/resource_controller.h"
 #include "net/url_request/url_request.h"
 
 namespace net {

content/browser/loader/stream_writer.cc

@@ -5,9 +5,9 @@
 #include "content/browser/loader/stream_writer.h"
 
 #include "base/guid.h"
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/streams/stream.h"
 #include "content/browser/streams/stream_registry.h"
-#include "content/public/browser/resource_controller.h"
 #include "net/base/io_buffer.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"

content/browser/loader/throttling_resource_handler.cc

@@ -6,8 +6,8 @@
 
 #include <utility>
 
+#include "content/browser/loader/resource_controller.h"
 #include "content/browser/loader/resource_request_info_impl.h"
-#include "content/public/browser/resource_controller.h"
 #include "content/public/common/resource_response.h"
 #include "net/url_request/url_request.h"
 

content/public/browser/BUILD.gn

@@ -205,7 +205,6 @@ source_set("browser_sources") {
     "render_widget_host_view_mac_delegate.h",
     "renderer_unresponsive_type.h",
     "resource_context.h",
-    "resource_controller.h",
     "resource_dispatcher_host.cc",
     "resource_dispatcher_host.h",
     "resource_dispatcher_host_delegate.cc",