Minor. RenderThreadObserverQt is really a RenderConfiguration

Follow same naming as in UserResourceController, which also implements
RenderThreadObserver.

Change-Id: I8a8386e6fb9fcc52826da1d0eef6efa97fd475e9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

5 files changed, 32 insertions, 28 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index a762c6fbb..bd1710009 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -84,7 +84,7 @@
 #include "common/qt_messages.h"
 #include "renderer/render_frame_observer_qt.h"
 #include "renderer/render_view_observer_qt.h"
-#include "renderer/render_thread_observer_qt.h"
+#include "renderer/render_configuration.h"
 #include "renderer/user_resource_controller.h"
 #if QT_CONFIG(webengine_webchannel)
 #include "renderer/web_channel_ipc_transport.h"
@@ -133,12 +133,12 @@ ContentRendererClientQt::~ContentRendererClientQt() {}
 void ContentRendererClientQt::RenderThreadStarted()
 {
     content::RenderThread *renderThread = content::RenderThread::Get();
-    m_renderThreadObserver.reset(new RenderThreadObserverQt());
+    m_renderConfiguration.reset(new RenderConfiguration());
     m_userResourceController.reset(new UserResourceController());
     m_visitedLinkReader.reset(new visitedlink::VisitedLinkReader);
     m_webCacheImpl.reset(new web_cache::WebCacheImpl());
 
-    renderThread->AddObserver(m_renderThreadObserver.data());
+    renderThread->AddObserver(m_renderConfiguration.data());
     renderThread->AddObserver(m_userResourceController.data());
 
 #if QT_CONFIG(webengine_spellchecker)
@@ -306,10 +306,11 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
         // NetErrorHelper::GetErrorStringsForDnsProbe, but that one is harder to untangle.
 
         error_page::LocalizedError::PageState errorPageState =
-            error_page::LocalizedError::GetPageState(
-                error.reason(), error.domain(), error.url(), isPost,
-                false, error.stale_copy_in_cache(), false, RenderThreadObserverQt::is_incognito_process(), false,
-                false, false, locale, std::unique_ptr<error_page::ErrorPageParams>());
+                error_page::LocalizedError::GetPageState(
+                        error.reason(), error.domain(), error.url(), isPost, false,
+                        error.stale_copy_in_cache(), false,
+                        RenderConfiguration::is_incognito_process(), false, false, false, locale,
+                        std::unique_ptr<error_page::ErrorPageParams>());
 
         resourceId = IDR_NET_ERROR_HTML;
 
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h
index bb67eb45f..3ac04fa34 100644
--- a/src/core/renderer/content_renderer_client_qt.h
+++ b/src/core/renderer/content_renderer_client_qt.h
@@ -76,7 +76,7 @@ struct WebPluginInfo;
 namespace QtWebEngineCore {
 
 class UserResourceController;
-class RenderThreadObserverQt;
+class RenderConfiguration;
 class ContentRendererClientQt
     : public content::ContentRendererClient
     , public service_manager::LocalInterfaceProvider
@@ -147,7 +147,7 @@ private:
     void GetNavigationErrorStringsInternal(content::RenderFrame *renderFrame, const std::string &httpMethod,
                                            const error_page::Error &error, std::string *errorHtml);
 
-    QScopedPointer<RenderThreadObserverQt> m_renderThreadObserver;
+    QScopedPointer<RenderConfiguration> m_renderConfiguration;
     QScopedPointer<UserResourceController> m_userResourceController;
     QScopedPointer<visitedlink::VisitedLinkReader> m_visitedLinkReader;
     QScopedPointer<web_cache::WebCacheImpl> m_webCacheImpl;
diff --git a/src/core/renderer/extensions/extensions_renderer_client_qt.cpp b/src/core/renderer/extensions/extensions_renderer_client_qt.cpp
index 7d4c9a83c..fd928df12 100644
--- a/src/core/renderer/extensions/extensions_renderer_client_qt.cpp
+++ b/src/core/renderer/extensions/extensions_renderer_client_qt.cpp
@@ -45,7 +45,7 @@
 #include "extensions_renderer_client_qt.h"
 
 #include "extensions_dispatcher_delegate_qt.h"
-#include "renderer/render_thread_observer_qt.h"
+#include "renderer/render_configuration.h"
 #include "renderer_permissions_policy_delegate_qt.h"
 #include "resource_request_policy_qt.h"
 
@@ -88,7 +88,7 @@ ExtensionsRendererClientQt::~ExtensionsRendererClientQt()
 // Returns true if the current render process was launched incognito.
 bool ExtensionsRendererClientQt::IsIncognitoProcess() const
 {
-    return RenderThreadObserverQt::is_incognito_process();
+    return RenderConfiguration::is_incognito_process();
 }
 
 // Returns the lowest isolated world ID available to extensions.
diff --git a/src/core/renderer/render_thread_observer_qt.cpp b/src/core/renderer/render_configuration.cpp
index edb66e8a5..ef9da7af7 100644
--- a/src/core/renderer/render_thread_observer_qt.cpp
+++ b/src/core/renderer/render_configuration.cpp
@@ -42,31 +42,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "renderer/render_thread_observer_qt.h"
+#include "renderer/render_configuration.h"
 #include "user_resource_controller.h"
 #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
 
 namespace QtWebEngineCore {
 
-bool RenderThreadObserverQt::m_isIncognitoProcess = false;
+bool RenderConfiguration::m_isIncognitoProcess = false;
 
-void RenderThreadObserverQt::RegisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces)
+void RenderConfiguration::RegisterMojoInterfaces(
+        blink::AssociatedInterfaceRegistry *associated_interfaces)
 {
     associated_interfaces->AddInterface(
-            base::Bind(&RenderThreadObserverQt::OnRendererConfigurationAssociatedRequest, base::Unretained(this)));
+            base::Bind(&RenderConfiguration::OnRendererConfigurationAssociatedRequest,
+                       base::Unretained(this)));
 }
 
-void RenderThreadObserverQt::UnregisterMojoInterfaces(blink::AssociatedInterfaceRegistry *associated_interfaces)
+void RenderConfiguration::UnregisterMojoInterfaces(
+        blink::AssociatedInterfaceRegistry *associated_interfaces)
 {
     associated_interfaces->RemoveInterface(qtwebengine::mojom::RendererConfiguration::Name_);
 }
 
-void RenderThreadObserverQt::SetInitialConfiguration(bool is_incognito_process)
+void RenderConfiguration::SetInitialConfiguration(bool is_incognito_process)
 {
     m_isIncognitoProcess = is_incognito_process;
 }
 
-void RenderThreadObserverQt::OnRendererConfigurationAssociatedRequest(
+void RenderConfiguration::OnRendererConfigurationAssociatedRequest(
         mojo::PendingAssociatedReceiver<qtwebengine::mojom::RendererConfiguration> receiver)
 {
     m_rendererConfigurationReceivers.Add(this, std::move(receiver));
diff --git a/src/core/renderer/render_thread_observer_qt.h b/src/core/renderer/render_configuration.h
index 05372049b..138a85bdc 100644
--- a/src/core/renderer/render_thread_observer_qt.h
+++ b/src/core/renderer/render_configuration.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef RENDER_THREAD_OBSERVER_QT_H
-#define RENDER_THREAD_OBSERVER_QT_H
+#ifndef RENDER_CONFIGURATION_H
+#define RENDER_CONFIGURATION_H
 
 #include "content/public/renderer/render_thread_observer.h"
 #include "mojo/public/cpp/bindings/associated_receiver_set.h"
@@ -47,13 +47,12 @@
 
 namespace QtWebEngineCore {
 
-class RenderThreadObserverQt
-    : public content::RenderThreadObserver
-    , public qtwebengine::mojom::RendererConfiguration
+class RenderConfiguration : public content::RenderThreadObserver,
+                            public qtwebengine::mojom::RendererConfiguration
 {
 public:
-    RenderThreadObserverQt() = default;
-    ~RenderThreadObserverQt() override = default;
+    RenderConfiguration() = default;
+    ~RenderConfiguration() override = default;
 
     static bool is_incognito_process() { return m_isIncognitoProcess; }
 
@@ -70,11 +69,12 @@ private:
 
     static bool m_isIncognitoProcess;
 
-    mojo::AssociatedReceiverSet<qtwebengine::mojom::RendererConfiguration> m_rendererConfigurationReceivers;
+    mojo::AssociatedReceiverSet<qtwebengine::mojom::RendererConfiguration>
+            m_rendererConfigurationReceivers;
 
-    DISALLOW_COPY_AND_ASSIGN(RenderThreadObserverQt);
+    DISALLOW_COPY_AND_ASSIGN(RenderConfiguration);
 };
 
 } // namespace QtWebEngineCore
 
-#endif // RENDER_THREAD_OBSERVER_QT_H
+#endif // RENDER_CONFIGURATION_H