Index: base/cpu.cc |
diff --git a/base/cpu.cc b/base/cpu.cc |
index 25328167425d4c0a242e0bfccaa47845737e81f9..8e2a621ff1f300fc2bf8691c3670410cfc0329c4 100644 |
--- a/base/cpu.cc |
+++ b/base/cpu.cc |
@@ -16,7 +16,6 @@ |
#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) |
#include "base/files/file_util.h" |
-#include "base/lazy_instance.h" |
#endif |
#if defined(ARCH_CPU_X86_FAMILY) |
@@ -130,9 +129,6 @@ class LazyCpuInfoValue { |
DISALLOW_COPY_AND_ASSIGN(LazyCpuInfoValue); |
}; |
-base::LazyInstance<LazyCpuInfoValue>::Leaky g_lazy_cpuinfo = |
- LAZY_INSTANCE_INITIALIZER; |
- |
#endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || |
// defined(OS_LINUX)) |
@@ -221,7 +217,8 @@ void CPU::Initialize() { |
has_non_stop_time_stamp_counter_ = (cpu_info[3] & (1 << 8)) != 0; |
} |
#elif defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) |
- cpu_brand_.assign(g_lazy_cpuinfo.Get().brand()); |
+ static auto lazy_cpuinfo = new LazyCpuInfoValue(); |
Mark Mentovai
2017/01/31 00:52:09
I don’t know how much digging you want to do at ea
|
+ cpu_brand_.assign(lazy_cpuinfo->brand()); |
#endif |
} |