1 files changed, 8 insertions, 8 deletions
diff --git a/remoting/base/tracer.cc b/remoting/base/tracer.cc
index 0126e1f..25ed244 100644
--- a/remoting/base/tracer.cc
+++ b/remoting/base/tracer.cc
@@ -7,12 +7,12 @@
 #include <list>
 
 #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"
 #include "base/stl_util-inl.h"
+#include "base/synchronization/condition_variable.h"
 #include "base/threading/thread.h"
 #include "base/threading/platform_thread.h"
 #include "base/threading/thread_local.h"
@@ -36,7 +36,7 @@ class OutputLogger {
 
   void OutputTrace(TraceBuffer* buffer) {
     scoped_ptr<TraceBuffer> buffer_ref_(buffer);
-    AutoLock l(lock_);
+    base::AutoLock l(lock_);
 
     // Drop messages if we're overwhelming the logger.
     if (buffers_.size() < 10) {
@@ -71,7 +71,7 @@ class OutputLogger {
     while(!stopped_) {
       TraceBuffer* buffer = NULL;
       {
-        AutoLock l(lock_);
+        base::AutoLock l(lock_);
         if (buffers_.size() == 0) {
           wake_.Wait();
         }
@@ -94,7 +94,7 @@ class OutputLogger {
 
   ~OutputLogger() {
     {
-      AutoLock l(lock_);
+      base::AutoLock l(lock_);
       stopped_ = true;
       wake_.Signal();
     }
@@ -103,10 +103,10 @@ class OutputLogger {
     STLDeleteElements(&buffers_);
   }
 
-  Lock lock_;
+  base::Lock lock_;
   base::Thread thread_;
   bool stopped_;
-  ConditionVariable wake_;
+  base::ConditionVariable wake_;
   std::list<TraceBuffer*> buffers_;
 };
 
@@ -125,7 +125,7 @@ Tracer::Tracer(const std::string& name, double sample_percent) {
 }
 
 void Tracer::PrintString(const std::string& s) {
-  AutoLock l(lock_);
+  base::AutoLock l(lock_);
   if (!buffer_.get()) {
     return;
   }
@@ -140,7 +140,7 @@ void Tracer::PrintString(const std::string& s) {
 }
 
 Tracer::~Tracer() {
-  AutoLock l(lock_);
+  base::AutoLock l(lock_);
 
   if (buffer_.get()) {
     g_output_logger.Get().OutputTrace(buffer_.release());