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 <jocelyn.turcotte@digia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/core/web_engine_library_info.h b/src/core/web_engine_library_info.h
index 644f85003..84fee12af 100644
--- a/src/core/web_engine_library_info.h
+++ b/src/core/web_engine_library_info.h
@@ -43,11 +43,13 @@
 #define WEB_ENGINE_LIBRARY_INFO_H
 
 #include "base/files/file_path.h"
+enum {
+    QT_RESOURCES_PAK = 5000
+};
 
 class WebEngineLibraryInfo {
 public:
-    static base::FilePath repackedResourcesPath();
-    static bool pathProviderQt(int key, base::FilePath* result);
+    static base::FilePath getPath(int key);
 };