From 514b9f71de89a14401e305f32c61fbad5759e5f2 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 13 Feb 2014 12:13:15 +0100 Subject: Fix path service assertions Registering a path provider did not turn out to be a clean enough solution for overriding chromium paths because of debug assertions that require the key range not to collide with already registered path providers. Instead of patching chromium or using workarounds switch back to using PathService::Override and only replace the jni-based default PathProviderAndroid on embedded android. Change-Id: I4530bc8fa3eba36c0d2403729be9a792f3c2120f Reviewed-by: Jocelyn Turcotte --- src/core/web_engine_context.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/core/web_engine_context.cpp') diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 193179ea1..3b0862128 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -45,7 +45,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" -#include "base/path_service.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h" #include "content/public/app/content_main_runner.h" @@ -131,11 +130,7 @@ WebEngineContext::WebEngineContext(WebContentsAdapterClient::RenderingMode rende CommandLine* parsedCommandLine = CommandLine::ForCurrentProcess(); parsedCommandLine->AppendSwitchASCII(switches::kUserAgent, webkit_glue::BuildUserAgentFromProduct("QtWebEngine/0.1")); - - base::FilePath subprocessPath; - PathService::Get(content::CHILD_PROCESS_EXE, &subprocessPath); - parsedCommandLine->AppendSwitchPath(switches::kBrowserSubprocessPath, subprocessPath); - + parsedCommandLine->AppendSwitchPath(switches::kBrowserSubprocessPath, WebEngineLibraryInfo::getPath(content::CHILD_PROCESS_EXE)); parsedCommandLine->AppendSwitch(switches::kNoSandbox); parsedCommandLine->AppendSwitch(switches::kDisablePlugins); -- cgit v1.2.3