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

remoting/protocol/protocol_test_client.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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 extern "C" {
 #include <unistd.h>
 }
@@ skipping 96 matching lines @@
  private:
   typedef std::list<scoped_refptr<ProtocolTestConnection> > ConnectionsList;
 
   void OnFinishedClosing();
   void DestroyConnection(scoped_refptr<ProtocolTestConnection> connection);
 
   std::string host_jid_;
   scoped_refptr<JingleClient> client_;
   scoped_refptr<JingleSessionManager> session_manager_;
   ConnectionsList connections_;
-  Lock connections_lock_;
+  base::Lock connections_lock_;
   base::WaitableEvent closed_event_;
 };
 
 
 void ProtocolTestConnection::Init(Session* session) {
   session_ = session;
 }
 
 void ProtocolTestConnection::Write(const std::string& str) {
   if (str.empty())
@@ skipping 101 matching lines @@
 
   session_manager_ = new JingleSessionManager(&jingle_thread);
 
   host_jid_ = host_jid;
 
   while (true) {
     std::string line;
     std::getline(std::cin, line);
 
     {
-      AutoLock auto_lock(connections_lock_);
+      base::AutoLock auto_lock(connections_lock_);
 
       // Broadcast message to all clients.
       for (ConnectionsList::iterator it = connections_.begin();
            it != connections_.end(); ++it) {
         (*it)->Write(line);
       }
     }
 
     if (line == "exit")
       break;
@@ skipping 52 matching lines @@
   std::cerr << "Accepting connection from " << session->jid() << std::endl;
 
   session->set_config(SessionConfig::CreateDefault());
   *response = SessionManager::ACCEPT;
 
   ProtocolTestConnection* test_connection =
       new ProtocolTestConnection(this, client_->message_loop());
   session->SetStateChangeCallback(
       NewCallback(test_connection, &ProtocolTestConnection::OnStateChange));
   test_connection->Init(session);
-  AutoLock auto_lock(connections_lock_);
+  base::AutoLock auto_lock(connections_lock_);
   connections_.push_back(make_scoped_refptr(test_connection));
 }
 
 void ProtocolTestClient::OnFinishedClosing() {
   closed_event_.Signal();
 }
 
 void ProtocolTestClient::DestroyConnection(
     scoped_refptr<ProtocolTestConnection> connection) {
   connection->Close();
-  AutoLock auto_lock(connections_lock_);
+  base::AutoLock auto_lock(connections_lock_);
   for (ConnectionsList::iterator it = connections_.begin();
        it != connections_.end(); ++it) {
     if ((*it) == connection) {
       connections_.erase(it);
       return;
     }
   }
 }
 
 }  // namespace protocol
@@ skipping 29 matching lines @@
   if (!cmd_line->HasSwitch("auth_token"))
     usage(argv[0]);
   std::string auth_token(cmd_line->GetSwitchValueASCII("auth_token"));
 
   scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient());
 
   client->Run(username, auth_token, host_jid);
 
   return 0;
 }