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

chrome/browser/sync/glue/autofill_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/autofill_model_associator.h"
 
 #include <vector>
 
 #include "base/task.h"
 #include "base/time.h"
@@ skipping 119 matching lines @@
   if (!web_database_->GetAutoFillProfiles(profiles))
     return false;
 
   return true;
 }
 
 bool AutofillModelAssociator::AssociateModels() {
   VLOG(1) << "Associating Autofill Models";
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   {
-    AutoLock lock(abort_association_pending_lock_);
+    base::AutoLock lock(abort_association_pending_lock_);
     abort_association_pending_ = false;
   }
 
   // TODO(zork): Attempt to load the model association from storage.
   std::vector<AutofillEntry> entries;
   ScopedVector<AutoFillProfile> profiles;
 
   if (!LoadAutofillData(&entries, &profiles.get())) {
     LOG(ERROR) << "Could not get the autofill data from WebDatabase.";
     return false;
@@ skipping 244 matching lines @@
   }
 
   // The sync model has user created nodes if the autofill folder has any
   // children.
   *has_nodes = sync_api::kInvalidId != autofill_node.GetFirstChildId();
   return true;
 }
 
 void AutofillModelAssociator::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*
 AutofillModelAssociator::GetChromeNodeFromSyncId(int64 sync_id) {
   SyncIdToAutofillMap::const_iterator iter = id_map_inverse_.find(sync_id);
   return iter == id_map_inverse_.end() ? NULL : &(iter->second);
 }
 
 bool AutofillModelAssociator::InitSyncNodeFromChromeId(
@@ skipping 32 matching lines @@
   sync_api::ReadTransaction trans(
       sync_service_->backend()->GetUserShareHandle());
   sync_api::ReadNode sync_node(&trans);
   if (!sync_node.InitByTagLookup(tag.c_str()))
     return false;
   *sync_id = sync_node.GetId();
   return true;
 }
 
 bool AutofillModelAssociator::IsAbortPending() {
-  AutoLock lock(abort_association_pending_lock_);
+  base::AutoLock lock(abort_association_pending_lock_);
   return abort_association_pending_;
 }
 
 // static
 std::string AutofillModelAssociator::KeyToTag(const string16& name,
                                               const string16& value) {
   std::string ns(kAutofillEntryNamespaceTag);
   return ns + EscapePath(UTF16ToUTF8(name)) + "|" +
          EscapePath(UTF16ToUTF8(value));
 }
@@ skipping 101 matching lines @@
 
       VLOG(1) << "[AUTOFILL MIGRATION]"
               << "Current autofill migration state is migrated.";
   }
 
   return false;
 }
 
 }  // namespace browser_sync