summaryrefslogtreecommitdiffstats
path: root/content/public
diff options
context:
space:
mode:
Diffstat (limited to 'content/public')
-rw-r--r--content/public/renderer/render_thread.cc4
-rw-r--r--content/public/renderer/render_view_observer_tracker.h2
-rw-r--r--content/public/utility/utility_thread.cc4
3 files changed, 5 insertions, 5 deletions
diff --git a/content/public/renderer/render_thread.cc b/content/public/renderer/render_thread.cc
index ea04fd2..ef04a50 100644
--- a/content/public/renderer/render_thread.cc
+++ b/content/public/renderer/render_thread.cc
@@ -11,8 +11,8 @@ namespace content {
// Keep the global RenderThread in a TLS slot so it is impossible to access
// incorrectly from the wrong thread.
-static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
- base::LINKER_INITIALIZED);
+static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls =
+ LAZY_INSTANCE_INITIALIZER;
RenderThread* RenderThread::Get() {
return lazy_tls.Pointer()->Get();
diff --git a/content/public/renderer/render_view_observer_tracker.h b/content/public/renderer/render_view_observer_tracker.h
index 5f719d1..4ea322b 100644
--- a/content/public/renderer/render_view_observer_tracker.h
+++ b/content/public/renderer/render_view_observer_tracker.h
@@ -61,7 +61,7 @@ class RenderViewObserverTracker {
template <class T>
base::LazyInstance<std::map<const RenderView*, T*> >
- RenderViewObserverTracker<T>::render_view_map_(base::LINKER_INITIALIZED);
+ RenderViewObserverTracker<T>::render_view_map_ = LAZY_INSTANCE_INITIALIZER;
} // namespace content
diff --git a/content/public/utility/utility_thread.cc b/content/public/utility/utility_thread.cc
index 4da5bfb..bc4bd30 100644
--- a/content/public/utility/utility_thread.cc
+++ b/content/public/utility/utility_thread.cc
@@ -11,8 +11,8 @@ namespace content {
// Keep the global UtilityThread in a TLS slot so it is impossible to access
// incorrectly from the wrong thread.
-static base::LazyInstance<base::ThreadLocalPointer<UtilityThread> > lazy_tls(
- base::LINKER_INITIALIZED);
+static base::LazyInstance<base::ThreadLocalPointer<UtilityThread> > lazy_tls =
+ LAZY_INSTANCE_INITIALIZER;
UtilityThread* UtilityThread::Get() {
return lazy_tls.Pointer()->Get();