Fix assignment of observer to RenderProcessHost.

By default Chromium uses the process-per-site-instance process model.
Therefore if there is a renderProcessHost which is already observed
we do not need to add another observer for user scripts.

Change-Id: Ic0c2104ebbefb2b8427c43c4c665d96b5a991ba1
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

src/core/content_browser_client_qt.cpp

@@ -332,7 +332,7 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost*
 {
     // FIXME: Add a settings variable to enable/disable the file scheme.
     content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme(host->GetID(), url::kFileScheme);
-    static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userScriptController()->renderProcessHostCreated(host);
+    static_cast<BrowserContextQt*>(host->GetBrowserContext())->m_adapter->userScriptController()->renderProcessStartedWithHost(host);
 }
 
 void ContentBrowserClientQt::ResourceDispatcherHostCreated()

src/core/user_script_controller_host.cpp

@@ -186,8 +186,11 @@ void UserScriptControllerHost::reserve(WebContentsAdapter *adapter, int count)
         m_perContentsScripts[adapter->webContents()].reserve(count);
 }
 
-void UserScriptControllerHost::renderProcessHostCreated(content::RenderProcessHost *renderer)
+void UserScriptControllerHost::renderProcessStartedWithHost(content::RenderProcessHost *renderer)
 {
+    if (m_observedProcesses.contains(renderer))
+        return;
+
     if (m_renderProcessObserver.isNull())
         m_renderProcessObserver.reset(new RenderProcessObserverHelper(this));
     renderer->AddObserver(m_renderProcessObserver.data());

src/core/user_script_controller_host.h

@@ -66,7 +66,7 @@ public:
     void reserve(WebContentsAdapter *adapter, int count);
     const QSet<UserScript> registeredScripts(WebContentsAdapter *adapter) const;
 
-    void renderProcessHostCreated(content::RenderProcessHost *renderer);
+    void renderProcessStartedWithHost(content::RenderProcessHost *renderer);
 
 private:
     Q_DISABLE_COPY(UserScriptControllerHost)