diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/base/path_service.cc | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/base/path_service.cc')
| -rw-r--r-- | chromium/base/path_service.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chromium/base/path_service.cc b/chromium/base/path_service.cc index 3f954d79e4b..1b9d3949300 100644 --- a/chromium/base/path_service.cc +++ b/chromium/base/path_service.cc @@ -13,7 +13,6 @@ #include "base/containers/hash_tables.h" #include "base/files/file_path.h" #include "base/files/file_util.h" -#include "base/lazy_instance.h" #include "base/logging.h" #include "base/synchronization/lock.h" #include "build/build_config.h" @@ -129,10 +128,9 @@ struct PathData { } }; -static LazyInstance<PathData>::Leaky g_path_data = LAZY_INSTANCE_INITIALIZER; - static PathData* GetPathData() { - return g_path_data.Pointer(); + static auto* path_data = new PathData(); + return path_data; } // Tries to find |key| in the cache. |path_data| should be locked by the caller! |