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

chrome/test/sync/engine/mock_connection_manager.cc

 // Copyright (c) 2009 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.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "chrome/test/sync/engine/mock_connection_manager.h"
 
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
@@ skipping 120 matching lines @@
     ProcessClearData(&post, &response);
   } else {
     EXPECT_TRUE(false) << "Unknown/unsupported ClientToServerMessage";
     return false;
   }
   if (client_command_.get()) {
     response.mutable_client_command()->CopyFrom(*client_command_.get());
   }
 
   {
-    AutoLock lock(response_code_override_lock_);
+    base::AutoLock lock(response_code_override_lock_);
     if (throttling_) {
       response.set_error_code(ClientToServerResponse::THROTTLED);
       throttling_ = false;
     }
 
     if (fail_with_auth_invalid_)
       response.set_error_code(ClientToServerResponse::AUTH_INVALID);
   }
 
   response.SerializeToString(params->buffer_out);
@@ skipping 342 matching lines @@
   return *commit_messages_->back();
 }
 
 const CommitResponse& MockConnectionManager::last_commit_response() const {
   EXPECT_TRUE(!commit_responses_.empty());
   return *commit_responses_->back();
 }
 
 void MockConnectionManager::ThrottleNextRequest(
     ResponseCodeOverrideRequestor* visitor) {
-  AutoLock lock(response_code_override_lock_);
+  base::AutoLock lock(response_code_override_lock_);
   throttling_ = true;
   if (visitor)
     visitor->OnOverrideComplete();
 }
 
 void MockConnectionManager::FailWithAuthInvalid(
     ResponseCodeOverrideRequestor* visitor) {
-  AutoLock lock(response_code_override_lock_);
+  base::AutoLock lock(response_code_override_lock_);
   fail_with_auth_invalid_ = true;
   if (visitor)
     visitor->OnOverrideComplete();
 }
 
 void MockConnectionManager::StopFailingWithAuthInvalid(
     ResponseCodeOverrideRequestor* visitor) {
-  AutoLock lock(response_code_override_lock_);
+  base::AutoLock lock(response_code_override_lock_);
   fail_with_auth_invalid_ = false;
   if (visitor)
     visitor->OnOverrideComplete();
 }
 
 bool MockConnectionManager::IsModelTypePresentInSpecifics(
     const sync_pb::EntitySpecifics& filter, syncable::ModelType value) {
   // This implementation is a little contorted; it's done this way
   // to avoid having to switch on the ModelType.  We're basically doing
   // the protobuf equivalent of ((value & filter) == filter).
@@ skipping 15 matching lines @@
 
 void MockConnectionManager::SetServerNotReachable() {
   server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   server_reachable_ = false;
   browser_sync::ServerConnectionEvent event = {
     browser_sync::ServerConnectionEvent::STATUS_CHANGED,
     server_status_,
     server_reachable_ };
   channel_->NotifyListeners(event);
 }