Cleanup directory structure

The src/core/renderer directory is meant to contain files that would be
in the renderer process and the chrome/renderer subdirectory in chromium,
but a few classes from the browser process and the renderer_host dir
has snuck in.

This patch cleans up the structure so that classes in the browser that
serves as host classes for renderer classes goes in renderer_host.

Change-Id: I9333b1322e2246d4da9b4e8cfe6be604f6d996bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

20 files changed, 23 insertions, 21 deletions

diff --git a/src/core/authentication_dialog_controller_p.h b/src/core/authentication_dialog_controller_p.h
index 2acc588e1..af5d92530 100644
--- a/src/core/authentication_dialog_controller_p.h
+++ b/src/core/authentication_dialog_controller_p.h
@@ -41,7 +41,8 @@
 #define AUTHENTICATION_DIALOG_CONTROLLER_P_H
 
 #include "base/memory/ref_counted.h"
-#include "resource_dispatcher_host_delegate_qt.h"
+
+#include "renderer_host/resource_dispatcher_host_delegate_qt.h"
 
 namespace QtWebEngineCore {
 
diff --git a/src/core/browser_context_adapter.cpp b/src/core/browser_context_adapter.cpp
index cf7987fa7..86808e177 100644
--- a/src/core/browser_context_adapter.cpp
+++ b/src/core/browser_context_adapter.cpp
@@ -41,6 +41,7 @@
 
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/browser_thread.h"
+
 #include "browser_context_qt.h"
 #include "content_client_qt.h"
 #include "download_manager_delegate_qt.h"
@@ -49,7 +50,7 @@
 #include "web_engine_context.h"
 #include "web_engine_visited_links_manager.h"
 #include "url_request_context_getter_qt.h"
-#include "user_resource_controller_host.h"
+#include "renderer_host/user_resource_controller_host.h"
 
 #include "net/proxy/proxy_service.h"
 
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp
index 5131d8229..a2453070e 100644
--- a/src/core/content_browser_client_qt.cpp
+++ b/src/core/content_browser_client_qt.cpp
@@ -81,8 +81,8 @@
 #if defined(ENABLE_BASIC_PRINTING)
 #include "printing_message_filter_qt.h"
 #endif // defined(ENABLE_BASIC_PRINTING)
-#include "resource_dispatcher_host_delegate_qt.h"
-#include "user_resource_controller_host.h"
+#include "renderer_host/resource_dispatcher_host_delegate_qt.h"
+#include "renderer_host/user_resource_controller_host.h"
 #include "web_contents_delegate_qt.h"
 #include "web_engine_context.h"
 #include "web_engine_library_info.h"
@@ -95,7 +95,7 @@
 #if defined(ENABLE_PLUGINS)
 #include "content/public/browser/browser_ppapi_host.h"
 #include "ppapi/host/ppapi_host.h"
-#include "renderer/pepper/pepper_host_factory_qt.h"
+#include "renderer_host/pepper/pepper_host_factory_qt.h"
 #endif
 
 #include <QGuiApplication>
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro
index 1f745a3f5..f5b9f870c 100644
--- a/src/core/core_gyp_generator.pro
+++ b/src/core/core_gyp_generator.pro
@@ -81,18 +81,20 @@ SOURCES = \
         render_view_observer_host_qt.cpp \
         render_widget_host_view_qt.cpp \
         renderer/content_renderer_client_qt.cpp \
-        renderer/pepper/pepper_flash_browser_host_qt.cpp \
         renderer/pepper/pepper_flash_renderer_host_qt.cpp \
-        renderer/pepper/pepper_host_factory_qt.cpp \
-        renderer/pepper/pepper_isolated_file_system_message_filter.cpp \
         renderer/pepper/pepper_renderer_host_factory_qt.cpp \
         renderer/render_frame_observer_qt.cpp \
         renderer/render_view_observer_qt.cpp \
         renderer/user_resource_controller.cpp \
         renderer/web_channel_ipc_transport.cpp \
+        renderer_host/pepper/pepper_flash_browser_host_qt.cpp \
+        renderer_host/pepper/pepper_host_factory_qt.cpp \
+        renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp \
+        renderer_host/resource_dispatcher_host_delegate_qt.cpp \
+        renderer_host/user_resource_controller_host.cpp \
+        renderer_host/web_channel_ipc_transport_host.cpp \
         resource_bundle_qt.cpp \
         resource_context_qt.cpp \
-        resource_dispatcher_host_delegate_qt.cpp \
         ssl_host_state_delegate_qt.cpp \
         stream_video_node.cpp \
         surface_factory_qt.cpp \
@@ -101,9 +103,7 @@ SOURCES = \
         url_request_custom_job.cpp \
         url_request_custom_job_delegate.cpp \
         url_request_qrc_job_qt.cpp \
-        user_resource_controller_host.cpp \
         user_script.cpp \
-        web_channel_ipc_transport_host.cpp \
         web_contents_adapter.cpp \
         web_contents_delegate_qt.cpp \
         web_contents_view_qt.cpp \
@@ -164,17 +164,19 @@ HEADERS = \
         render_widget_host_view_qt.h \
         render_widget_host_view_qt_delegate.h \
         renderer/content_renderer_client_qt.h \
-        renderer/pepper/pepper_flash_browser_host_qt.h \
         renderer/pepper/pepper_flash_renderer_host_qt.h \
-        renderer/pepper/pepper_host_factory_qt.h \
-        renderer/pepper/pepper_isolated_file_system_message_filter.h \
         renderer/pepper/pepper_renderer_host_factory_qt.h \
         renderer/render_frame_observer_qt.h \
         renderer/render_view_observer_qt.h \
         renderer/user_resource_controller.h \
         renderer/web_channel_ipc_transport.h \
+        renderer_host/pepper/pepper_flash_browser_host_qt.h \
+        renderer_host/pepper/pepper_host_factory_qt.h \
+        renderer_host/pepper/pepper_isolated_file_system_message_filter.h \
+        renderer_host/resource_dispatcher_host_delegate_qt.h \
+        renderer_host/user_resource_controller_host.h \
+        renderer_host/web_channel_ipc_transport_host.h \
         resource_context_qt.h \
-        resource_dispatcher_host_delegate_qt.h \
         ssl_host_state_delegate_qt.h \
         stream_video_node.h \
         surface_factory_qt.h \
@@ -183,9 +185,7 @@ HEADERS = \
         url_request_custom_job.h \
         url_request_custom_job_delegate.h \
         url_request_qrc_job_qt.h \
-        user_resource_controller_host.h \
         user_script.h \
-        web_channel_ipc_transport_host.h \
         web_contents_adapter.h \
         web_contents_adapter_client.h \
         web_contents_adapter_p.h \
diff --git a/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp
index 4427a67f2..4427a67f2 100644
--- a/src/core/renderer/pepper/pepper_flash_browser_host_qt.cpp
+++ b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp
diff --git a/src/core/renderer/pepper/pepper_flash_browser_host_qt.h b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.h
index 5d1107dfb..5d1107dfb 100644
--- a/src/core/renderer/pepper/pepper_flash_browser_host_qt.h
+++ b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.h
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.cpp b/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp
index 4a25e7756..4a25e7756 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.cpp
+++ b/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.h b/src/core/renderer_host/pepper/pepper_host_factory_qt.h
index 0446cf9e3..0446cf9e3 100644
--- a/src/core/renderer/pepper/pepper_host_factory_qt.h
+++ b/src/core/renderer_host/pepper/pepper_host_factory_qt.h
diff --git a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp
index 7e8b2fdda..7e8b2fdda 100644
--- a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.cpp
+++ b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp
diff --git a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.h b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
index 750f7cea0..750f7cea0 100644
--- a/src/core/renderer/pepper/pepper_isolated_file_system_message_filter.h
+++ b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.h
diff --git a/src/core/resource_dispatcher_host_delegate_qt.cpp b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp
index 16a4e7265..16a4e7265 100644
--- a/src/core/resource_dispatcher_host_delegate_qt.cpp
+++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp
diff --git a/src/core/resource_dispatcher_host_delegate_qt.h b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
index a8a65cfb7..a8a65cfb7 100644
--- a/src/core/resource_dispatcher_host_delegate_qt.h
+++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.h
diff --git a/src/core/user_resource_controller_host.cpp b/src/core/renderer_host/user_resource_controller_host.cpp
index 9d2ba8eb8..9d2ba8eb8 100644
--- a/src/core/user_resource_controller_host.cpp
+++ b/src/core/renderer_host/user_resource_controller_host.cpp
diff --git a/src/core/user_resource_controller_host.h b/src/core/renderer_host/user_resource_controller_host.h
index 8e6e1e3bf..8e6e1e3bf 100644
--- a/src/core/user_resource_controller_host.h
+++ b/src/core/renderer_host/user_resource_controller_host.h
diff --git a/src/core/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
index aef16f0a0..aef16f0a0 100644
--- a/src/core/web_channel_ipc_transport_host.cpp
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp
diff --git a/src/core/web_channel_ipc_transport_host.h b/src/core/renderer_host/web_channel_ipc_transport_host.h
index 75b40477e..75b40477e 100644
--- a/src/core/web_channel_ipc_transport_host.h
+++ b/src/core/renderer_host/web_channel_ipc_transport_host.h
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 6cbfe2867..c8d93b3f0 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -53,9 +53,9 @@
 #include "pdfium_printing_wrapper_qt.h"
 #include "print_view_manager_qt.h"
 #include "qwebenginecallback_p.h"
+#include "renderer_host/web_channel_ipc_transport_host.h"
 #include "render_view_observer_host_qt.h"
 #include "type_conversion.h"
-#include "web_channel_ipc_transport_host.h"
 #include "web_contents_adapter_client.h"
 #include "web_contents_view_qt.h"
 #include "web_engine_context.h"
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index 8ec5d1fe7..f02ba3702 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -44,7 +44,7 @@
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QTimerEvent>
-#include "user_resource_controller_host.h"
+#include "renderer_host/user_resource_controller_host.h"
 
 using QtWebEngineCore::UserScript;
 
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 2876e4fb4..1fdab6a52 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -63,8 +63,8 @@
 
 #include "render_widget_host_view_qt_delegate_quick.h"
 #include "render_widget_host_view_qt_delegate_quickwindow.h"
+#include "renderer_host/user_resource_controller_host.h"
 #include "ui_delegates_manager.h"
-#include "user_resource_controller_host.h"
 #include "web_contents_adapter.h"
 #include "web_engine_error.h"
 #include "web_engine_settings.h"
diff --git a/src/webenginewidgets/api/qwebenginescriptcollection.cpp b/src/webenginewidgets/api/qwebenginescriptcollection.cpp
index 4b77b4699..8d393924f 100644
--- a/src/webenginewidgets/api/qwebenginescriptcollection.cpp
+++ b/src/webenginewidgets/api/qwebenginescriptcollection.cpp
@@ -40,7 +40,7 @@
 #include "qwebenginescriptcollection.h"
 #include "qwebenginescriptcollection_p.h"
 
-#include "user_resource_controller_host.h"
+#include "renderer_host/user_resource_controller_host.h"
 
 using QtWebEngineCore::UserScript;