Revert "Revert "libmojo: Uprev the library to r456626 from Chromium""
This reverts commit 21a249e4d9cb0b2ec6f0ff84ed5f7939ea67ac52.
Test: Build.
Change-Id: I2f77e0bb4541d6520dac974cd499b30561c6658f
diff --git a/base/path_service.cc b/base/path_service.cc
index 3f954d7..1b9d394 100644
--- a/base/path_service.cc
+++ b/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 @@
}
};
-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!