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

remoting/host/chromoting_host.cc

 // 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.
 
 #include "remoting/host/chromoting_host.h"
 
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "remoting/base/constants.h"
@@ skipping 52 matching lines @@
         FROM_HERE,
         NewRunnableMethod(this, &ChromotingHost::Start, shutdown_task));
     return;
   }
 
   DCHECK(!jingle_client_);
   DCHECK(shutdown_task);
 
   // Make sure this object is not started.
   {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     if (state_ != kInitial)
       return;
     state_ = kStarted;
   }
 
   // Save the shutdown task.
   shutdown_task_.reset(shutdown_task);
 
   std::string xmpp_login;
   std::string xmpp_auth_token;
@@ skipping 22 matching lines @@
 void ChromotingHost::Shutdown() {
   if (MessageLoop::current() != context_->main_message_loop()) {
     context_->main_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ChromotingHost::Shutdown));
     return;
   }
 
   // No-op if this object is not started yet.
   {
-    AutoLock auto_lock(lock_);
+    base::AutoLock auto_lock(lock_);
     if (state_ != kStarted) {
       state_ = kStopped;
       return;
     }
     state_ = kStopped;
   }
 
   // Tell the session to pause and then disconnect all clients.
   if (recorder_.get()) {
     recorder_->Pause();
@@ skipping 130 matching lines @@
 
     // TODO(sergeyu): We should try reconnecting here instead of terminating
     // the host.
     Shutdown();
   }
 }
 
 void ChromotingHost::OnNewClientSession(
     protocol::Session* session,
     protocol::SessionManager::IncomingSessionResponse* response) {
-  AutoLock auto_lock(lock_);
+  base::AutoLock auto_lock(lock_);
   // TODO(hclam): Allow multiple clients to connect to the host.
   if (connection_.get() || state_ != kStarted) {
     *response = protocol::SessionManager::DECLINE;
     return;
   }
 
   // Check that the client has access to the host.
   if (!access_verifier_.VerifyPermissions(session->jid(),
                                           session->initiator_token())) {
     *response = protocol::SessionManager::DECLINE;
@@ skipping 59 matching lines @@
   return NULL;
 }
 
 std::string ChromotingHost::GenerateHostAuthToken(
     const std::string& encoded_client_token) {
   // TODO(ajwong): Return the signature of this instead.
   return encoded_client_token;
 }
 
 }  // namespace remoting