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

remoting/jingle_glue/jingle_client.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_JINGLE_GLUE_JINGLE_CLIENT_H_
 #define REMOTING_JINGLE_GLUE_JINGLE_CLIENT_H_
 
 #include <string>
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "third_party/libjingle/source/talk/xmpp/xmppclient.h"
 
 class MessageLoop;
 class Task;
 
 namespace talk_base {
 class NetworkManager;
 }  // namespace talk_base
 
 namespace buzz {
@@ skipping 94 matching lines @@
 
   // JingleThread used for the connection. Set in the constructor.
   JingleThread* thread_;
 
   // Callback for this object. Callback must not be called if closed_ == true.
   Callback* callback_;
 
   // The XmppClient and its state and jid.
   buzz::XmppClient* client_;
   State state_;
-  Lock full_jid_lock_;
+  base::Lock full_jid_lock_;
   std::string full_jid_;
 
   // Current state of the object.
-  Lock state_lock_;  // Must be locked when accessing initialized_ or closed_.
+  // Must be locked when accessing initialized_ or closed_.
+  base::Lock state_lock_;
   bool initialized_;
   bool closed_;
   scoped_ptr<Task> closed_task_;
 
   scoped_ptr<talk_base::NetworkManager> network_manager_;
   scoped_ptr<cricket::BasicPortAllocator> port_allocator_;
   scoped_ptr<cricket::SessionManager> session_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_JINGLE_GLUE_JINGLE_CLIENT_H_