summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
Diffstat (limited to 'remoting')
-rw-r--r--remoting/base/tracer.cc14
1 files changed, 4 insertions, 10 deletions
diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc
index 3cef3a0..3245887 100644
--- a/remoting/base/tracer.cc
+++ b/remoting/base/tracer.cc
@@ -8,7 +8,6 @@
#include "base/basictypes.h"
#include "base/condition_variable.h"
-#include "base/lazy_instance.h"
#include "base/message_loop.h"
#include "base/rand_util.h"
#include "base/ref_counted.h"
@@ -89,7 +88,7 @@ class OutputLogger {
}
private:
- friend struct base::DefaultLazyInstanceTraits<OutputLogger>;
+ friend struct DefaultSingletonTraits<OutputLogger>;
~OutputLogger() {
{
@@ -109,11 +108,6 @@ class OutputLogger {
std::list<TraceBuffer*> buffers_;
};
-static base::LazyInstance<OutputLogger> g_output_logger(
- base::LINKER_INITIALIZED);
-static base::LazyInstance<base::ThreadLocalPointer<TraceContext> >
- g_thread_local_trace_context(base::LINKER_INITIALIZED);
-
} // namespace
Tracer::Tracer(const std::string& name, double sample_percent) {
@@ -142,7 +136,7 @@ Tracer::~Tracer() {
AutoLock l(lock_);
if (buffer_.get()) {
- g_output_logger.Get().OutputTrace(buffer_.release());
+ Singleton<OutputLogger>::get()->OutputTrace(buffer_.release());
}
}
@@ -164,11 +158,11 @@ void TraceContext::PopTracer() {
// static
TraceContext* TraceContext::Get() {
TraceContext* context =
- g_thread_local_trace_context.Get().Get();
+ Singleton<base::ThreadLocalPointer<TraceContext> >::get()->Get();
if (context == NULL) {
context = new TraceContext();
context->PushTracerInternal(new Tracer("default", 0.0));
- g_thread_local_trace_context.Get().Set(context);
+ Singleton<base::ThreadLocalPointer<TraceContext> >::get()->Set(context);
}
return context;
}