Avoid duplicate g_instance definition, to compile with Jumbo.

TBR=bratell@opera.com,tzik@chromium.org Change-Id: I18ed5a01a9142725c96972a8d774e41f69f6f818 Reviewed-on: https://chromium-review.googlesource.com/792942 Reviewed-by: Morten Stenshorne <mstensho@chromium.org> Commit-Queue: Morten Stenshorne <mstensho@chromium.org> Cr-Commit-Position: refs/heads/master@{#519655}
Denger-Network · Nov 28, 2017 · 912d693 · 912d693
1 parent 66d28a0
commit 912d693
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/base/time/default_clock.cc b/base/time/default_clock.cc
@@ -8,7 +8,8 @@
 
 namespace base {
 namespace {
-LazyInstance<DefaultClock>::Leaky g_instance = LAZY_INSTANCE_INITIALIZER;
+LazyInstance<DefaultClock>::Leaky g_default_clock_instance =
+    LAZY_INSTANCE_INITIALIZER;
 }
 
 DefaultClock::~DefaultClock() {}
@@ -19,7 +20,7 @@ Time DefaultClock::Now() {
 
 // static
 DefaultClock* DefaultClock::GetInstance() {
-  return g_instance.Pointer();
+  return g_default_clock_instance.Pointer();
 }
 
 }  // namespace base
diff --git a/base/time/default_tick_clock.cc b/base/time/default_tick_clock.cc
@@ -8,7 +8,8 @@
 
 namespace base {
 namespace {
-LazyInstance<DefaultTickClock>::Leaky g_instance = LAZY_INSTANCE_INITIALIZER;
+LazyInstance<DefaultTickClock>::Leaky g_default_tick_clock_instance =
+    LAZY_INSTANCE_INITIALIZER;
 }
 
 DefaultTickClock::~DefaultTickClock() {}
@@ -19,7 +20,7 @@ TimeTicks DefaultTickClock::NowTicks() {
 
 // static
 DefaultTickClock* DefaultTickClock::GetInstance() {
-  return g_instance.Pointer();
+  return g_default_tick_clock_instance.Pointer();
 }
 
 }  // namespace base