1 files changed, 12 insertions, 3 deletions
diff --git a/src/core/content_main_delegate_qt.cpp b/src/core/content_main_delegate_qt.cpp
index 30bac71af..2d7d1eb57 100644
--- a/src/core/content_main_delegate_qt.cpp
+++ b/src/core/content_main_delegate_qt.cpp
@@ -55,6 +55,7 @@
 #include "ui/base/webui/jstemplate_builder.h"
 #include "net/grit/net_resources.h"
 #include "net/base/net_module.h"
+#include "services/service_manager/embedder/switches.h"
 #include "services/service_manager/sandbox/switches.h"
 #include "url/url_util_qt.h"
 
@@ -177,7 +178,7 @@ void ContentMainDelegateQt::PreSandboxStartup()
 #endif
 
     net::NetModule::SetResourceProvider(PlatformResourceProvider);
-    ui::ResourceBundle::InitSharedInstanceWithLocale(WebEngineLibraryInfo::getApplicationLocale(), 0, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
+    ui::ResourceBundle::InitSharedInstanceWithLocale(WebEngineLibraryInfo::getApplicationLocale(), nullptr, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 
     base::CommandLine* parsedCommandLine = base::CommandLine::ForCurrentProcess();
     logging::LoggingSettings settings;
@@ -231,6 +232,16 @@ void ContentMainDelegateQt::PreSandboxStartup()
     }
 }
 
+void ContentMainDelegateQt::PostEarlyInitialization(bool)
+{
+    PostFieldTrialInitialization();
+}
+
+content::ContentClient *ContentMainDelegateQt::CreateContentClient()
+{
+    return &m_contentClient;
+}
+
 content::ContentBrowserClient *ContentMainDelegateQt::CreateContentBrowserClient()
 {
     m_browserClient.reset(new ContentBrowserClientQt);
@@ -295,8 +306,6 @@ bool ContentMainDelegateQt::BasicStartupComplete(int *exit_code)
 #if QT_CONFIG(webengine_spellchecker)
     SafeOverridePath(base::DIR_APP_DICTIONARIES, WebEngineLibraryInfo::getPath(base::DIR_APP_DICTIONARIES));
 #endif
-    if (!content::GetContentClient())
-        content::SetContentClient(new ContentClientQt);
 
     url::CustomScheme::LoadSchemes(base::CommandLine::ForCurrentProcess());