Migrate user script IPC to mojo

Use mojo instead of old IPC, keep current design and use two
interfaces one global and one per frame for now, also use
in both cases associated interface with ipc channel otherwise
script can be added during the page load, which will radomly
brake tests.

This change moves UserDataScript to chromium since mojo binding
generation did not work correctly. Use StructTraits when serializing
the class.

Change-Id: I7073fb831c96849e47864382188300db3c9137d9
Reviewed-by: Allan Sandfeld Jensen <[email protected]>

Author: Michal Klocek

src/core/common/qt_messages.h

@@ -9,20 +9,6 @@
 #include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_message_macros.h"
 #include "ppapi/buildflags/buildflags.h"
-#include "user_script_data.h"
-
-IPC_STRUCT_TRAITS_BEGIN(UserScriptData)
-    IPC_STRUCT_TRAITS_MEMBER(source)
-    IPC_STRUCT_TRAITS_MEMBER(url)
-    IPC_STRUCT_TRAITS_MEMBER(injectionPoint)
-    IPC_STRUCT_TRAITS_MEMBER(injectForSubframes)
-    IPC_STRUCT_TRAITS_MEMBER(worldId)
-    IPC_STRUCT_TRAITS_MEMBER(scriptId)
-    IPC_STRUCT_TRAITS_MEMBER(globs)
-    IPC_STRUCT_TRAITS_MEMBER(excludeGlobs)
-    IPC_STRUCT_TRAITS_MEMBER(urlPatterns)
-IPC_STRUCT_TRAITS_END()
-
 
 #define IPC_MESSAGE_START QtMsgStart
 
@@ -39,17 +25,6 @@ IPC_MESSAGE_ROUTED1(RenderViewObserverQt_FetchDocumentInnerText,
 IPC_MESSAGE_ROUTED1(RenderViewObserverQt_SetBackgroundColor,
                     uint32_t /* color */)
 
-// User scripts messages
-IPC_MESSAGE_ROUTED1(RenderFrameObserverHelper_AddScript,
-                    UserScriptData /* script */)
-IPC_MESSAGE_ROUTED1(RenderFrameObserverHelper_RemoveScript,
-                    UserScriptData /* script */)
-IPC_MESSAGE_ROUTED0(RenderFrameObserverHelper_ClearScripts)
-
-IPC_MESSAGE_CONTROL1(UserResourceController_AddScript, UserScriptData /* scriptContents */)
-IPC_MESSAGE_CONTROL1(UserResourceController_RemoveScript, UserScriptData /* scriptContents */)
-IPC_MESSAGE_CONTROL0(UserResourceController_ClearScripts)
-
 // Tells the renderer whether or not a file system access has been allowed.
 IPC_MESSAGE_ROUTED2(QtWebEngineMsg_RequestFileSystemAccessAsyncResponse,
                     int  /* request_id */,

src/core/common/user_script_data.cpp

@@ -52,7 +52,6 @@ SOURCES = \
         color_chooser_controller.cpp \
         common/qt_ipc_logging.cpp \
         common/qt_messages.cpp \
-        common/user_script_data.cpp \
         compositor/content_gpu_client_qt.cpp \
         compositor/display_frame_sink.cpp \
         compositor/display_overrides.cpp \
@@ -155,7 +154,6 @@ HEADERS = \
         color_chooser_controller_p.h \
         color_chooser_controller.h \
         common/qt_messages.h \
-        common/user_script_data.h \
         compositor/content_gpu_client_qt.h \
         compositor/display_frame_sink.h \
         compositor/display_software_output_surface.h \

src/core/common/user_script_data.h

@@ -41,6 +41,7 @@ deps = [
   "//ui/accessibility",
   "//ui/gl",
   "//qtwebengine/browser:interfaces",
+  "//qtwebengine/userscript",
   "//qtwebengine/browser:service_manifests",
   "//qtwebengine/common:mojo_bindings",
   ":qtwebengine_sources",

src/core/core_chromium.pri

@@ -43,7 +43,7 @@
 // found in the LICENSE file.
 
 #include "renderer/render_thread_observer_qt.h"
-
+#include "user_resource_controller.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 
 namespace QtWebEngineCore {
@@ -54,11 +54,15 @@ void RenderThreadObserverQt::RegisterMojoInterfaces(blink::AssociatedInterfaceRe
 {
     associated_interfaces->AddInterface(
             base::Bind(&RenderThreadObserverQt::OnRendererConfigurationAssociatedRequest, base::Unretained(this)));
+    associated_interfaces->AddInterface(
+            base::Bind(&UserResourceController::BindReceiver,
+                       base::Unretained(UserResourceController::instance())));
 }
 
 void RenderThreadObserverQt::UnregisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces)
 {
     associated_interfaces->RemoveInterface(qtwebengine::mojom::RendererConfiguration::Name_);
+    associated_interfaces->RemoveInterface(qtwebengine::mojom::UserResourceController::Name_);
 }
 
 void RenderThreadObserverQt::SetInitialConfiguration(bool is_incognito_process)