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

chrome/browser/sync/glue/password_model_associator.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 "chrome/browser/sync/glue/password_model_associator.h"
 
 #include <set>
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 23 matching lines @@
 #else
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 #endif
 }
 
 PasswordModelAssociator::~PasswordModelAssociator() {}
 
 bool PasswordModelAssociator::AssociateModels() {
   DCHECK(expected_loop_ == MessageLoop::current());
   {
-    AutoLock lock(abort_association_pending_lock_);
+    base::AutoLock lock(abort_association_pending_lock_);
     abort_association_pending_ = false;
   }
 
   sync_api::WriteTransaction trans(
       sync_service_->backend()->GetUserShareHandle());
   sync_api::ReadNode password_root(&trans);
   if (!password_root.InitByTagLookup(kPasswordTag)) {
     LOG(ERROR) << "Server did not create the top-level password node. We "
                << "might be running against an out-of-date server.";
     return false;
@@ skipping 132 matching lines @@
   }
 
   // The sync model has user created nodes if the password folder has any
   // children.
   *has_nodes = sync_api::kInvalidId != password_node.GetFirstChildId();
   return true;
 }
 
 void PasswordModelAssociator::AbortAssociation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  AutoLock lock(abort_association_pending_lock_);
+  base::AutoLock lock(abort_association_pending_lock_);
   abort_association_pending_ = true;
 }
 
 const std::string* PasswordModelAssociator::GetChromeNodeFromSyncId(
     int64 sync_id) {
   return NULL;
 }
 
 bool PasswordModelAssociator::InitSyncNodeFromChromeId(
     const std::string& node_id,
     sync_api::BaseNode* sync_node) {
   return false;
 }
 
 bool PasswordModelAssociator::IsAbortPending() {
-  AutoLock lock(abort_association_pending_lock_);
+  base::AutoLock lock(abort_association_pending_lock_);
   return abort_association_pending_;
 }
 
 int64 PasswordModelAssociator::GetSyncIdFromChromeId(
     const std::string& password) {
   PasswordToSyncIdMap::const_iterator iter = id_map_.find(password);
   return iter == id_map_.end() ? sync_api::kInvalidId : iter->second;
 }
 
 void PasswordModelAssociator::Associate(
@@ skipping 164 matching lines @@
     const std::string& password_element,
     const std::string& signon_realm) {
   return EscapePath(origin_url) + "|" +
          EscapePath(username_element) + "|" +
          EscapePath(username_value) + "|" +
          EscapePath(password_element) + "|" +
          EscapePath(signon_realm);
 }
 
 }  // namespace browser_sync