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

remoting/protocol/buffered_socket_writer.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.
 
 #ifndef REMOTING_PROTOCOL_BUFFERED_SOCKET_WRITER_H_
 #define REMOTING_PROTOCOL_BUFFERED_SOCKET_WRITER_H_
 
 #include <list>
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "net/base/io_buffer.h"
 #include "net/socket/socket.h"
 
 class MessageLoop;
 class Task;
 
 namespace net {
 class Socket;
 }  // namespace net
 
@@ skipping 57 matching lines @@
   virtual void OnError_Locked(int result) = 0;
 
  private:
   void DoWrite();
   void OnWritten(int result);
 
   // This method is called when an error is encountered.
   void HandleError(int result);
 
   // Must be locked when accessing |socket_|, |queue_| and |buffer_size_|;
-  Lock lock_;
+  base::Lock lock_;
 
   net::Socket* socket_;
   MessageLoop* message_loop_;
   scoped_ptr<WriteFailedCallback> write_failed_callback_;
 
   bool write_pending_;
 
   net::CompletionCallbackImpl<BufferedSocketWriterBase> written_callback_;
 
   bool closed_;
@@ skipping 21 matching lines @@
  protected:
   virtual void GetNextPacket_Locked(net::IOBuffer** buffer, int* size);
   virtual void AdvanceBufferPosition_Locked(int written);
   virtual void OnError_Locked(int result);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_BUFFERED_SOCKET_WRITER_H_