Remove obsolete base/lock.h and fix up callers to use the new header file and

the base namespace. Fix several files including lock.h unnecessarily.

BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 9 deletions

diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc
index 6484e5a..7b00d79 100644
--- a/remoting/jingle_glue/jingle_client.cc
+++ b/remoting/jingle_glue/jingle_client.cc
@@ -32,7 +32,7 @@ JingleClient::JingleClient(JingleThread* thread)
 }
 
 JingleClient::~JingleClient() {
-  AutoLock auto_lock(state_lock_);
+  base::AutoLock auto_lock(state_lock_);
   DCHECK(!initialized_ || closed_);
 }
 
@@ -42,7 +42,7 @@ void JingleClient::Init(
   DCHECK_NE(username, "");
 
   {
-    AutoLock auto_lock(state_lock_);
+    base::AutoLock auto_lock(state_lock_);
     DCHECK(!initialized_ && !closed_);
     initialized_ = true;
 
@@ -101,7 +101,7 @@ void JingleClient::Close() {
 
 void JingleClient::Close(Task* closed_task) {
   {
-    AutoLock auto_lock(state_lock_);
+    base::AutoLock auto_lock(state_lock_);
     // If the client is already closed then don't close again.
     if (closed_) {
       if (closed_task)
@@ -137,7 +137,7 @@ void JingleClient::DoClose() {
 }
 
 std::string JingleClient::GetFullJid() {
-  AutoLock auto_lock(full_jid_lock_);
+  base::AutoLock auto_lock(full_jid_lock_);
   return full_jid_;
 }
 
@@ -179,7 +179,7 @@ void JingleClient::OnConnectionStateChanged(buzz::XmppEngine::State state) {
 }
 
 void JingleClient::SetFullJid(const std::string& full_jid) {
-  AutoLock auto_lock(full_jid_lock_);
+  base::AutoLock auto_lock(full_jid_lock_);
   full_jid_ = full_jid;
 }
 
@@ -189,7 +189,7 @@ void JingleClient::UpdateState(State new_state) {
     {
       // We have to have the lock held, otherwise we cannot be sure that
       // the client hasn't been closed when we call the callback.
-      AutoLock auto_lock(state_lock_);
+      base::AutoLock auto_lock(state_lock_);
       if (!closed_)
         callback_->OnStateChange(this, new_state);
     }
diff --git a/remoting/jingle_glue/jingle_client.h b/remoting/jingle_glue/jingle_client.h
index 1d0920a..173e90e 100644
--- a/remoting/jingle_glue/jingle_client.h
+++ b/remoting/jingle_glue/jingle_client.h
@@ -7,8 +7,8 @@
 
 #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;
@@ -123,11 +123,12 @@ class JingleClient : public base::RefCountedThreadSafe<JingleClient>,
   // 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_;