Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

remoting/base/tracer.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Tracer objects uresed to record an annotated timeline of events for use in
 // gathering performance data.  It wraps a TraceBuffer which is the raw data
 // for a trace. Tracer is threadsafe.
 //
 // TraceContext is a singleton that is used to give information for the current
 // trace. Clients should query TraceContext to find the current tracer and then
@@ skipping 35 matching lines @@
 // For each call of StartDecode(), the related calls to OnFrameOutput() and
 // DecodeDone() will be annotated to the Tracer created by the ScopedTracer
 // declaration allowing for creating of timing information over the related
 // asynchronous Task invocations.
 
 #ifndef REMOTING_BASE_TRACER_H_
 #define REMOTING_BASE_TRACER_H_
 
 #include <string>
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/singleton.h"
+#include "base/synchronization/lock.h"
 #include "base/task.h"
 #include "base/scoped_ptr.h"
 #include "remoting/proto/trace.pb.h"
 
 namespace remoting {
 
 class Tracer : public base::RefCountedThreadSafe<Tracer> {
  public:
   // The |name| is just a label for the given tracer. It is recorder into the
   // trace buffer and printed at the end. Use it specify one logical flow such
   // as "Host Update Request".  The sample_percent is to allow for gathering a
   // random sampling of the traces. This allows the tracer to be used in a
   // high-frequency code path without spamming the log, or putting undo load on
   // the system.  Use 0.0 to disable the tracer completely, and 1.0 to log
   // everything.
   Tracer(const std::string& name, double sample_percent);
 
   // TODO(ajwong): Consider using an ostream interface similar to DLOG.
   void PrintString(const std::string& s);
 
   void OutputTrace();
 
  private:
   friend class base::RefCountedThreadSafe<Tracer>;
   virtual ~Tracer();
 
-  Lock lock_;
+  base::Lock lock_;
   scoped_ptr<TraceBuffer> buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(Tracer);
 };
 
 class TraceContext {
  public:
   // Get the current tracer.
   static Tracer* tracer();
 
@@ skipping 147 matching lines @@
                                                                   e, f, g));
 }
 
 #else
 #  define NewTracedMethod NewRunnableMethod
 #endif
 
 }  // namespace remoting
 
 #endif  // REMOTING_BASE_TRACER_H_