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

chrome/browser/sync/util/user_settings.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.
 //
 // This class isn't pretty. It's just a step better than globals, which is what
 // these were previously.
 
 #include "chrome/browser/sync/util/user_settings.h"
 
 #include "build/build_config.h"
@@ skipping 61 matching lines @@
 static const int kCurrentDBVersion = 12;
 
 UserSettings::ScopedDBHandle::ScopedDBHandle(UserSettings* settings)
     : mutex_lock_(settings->dbhandle_mutex_), handle_(&settings->dbhandle_) {
 }
 
 UserSettings::UserSettings() : dbhandle_(NULL) {
 }
 
 string UserSettings::email() const {
-  AutoLock lock(mutex_);
+  base::AutoLock lock(mutex_);
   return email_;
 }
 
 static void MakeSigninsTable(sqlite3* const dbhandle) {
   // Multiple email addresses can map to the same Google Account. This table
   // keeps a map of sign-in email addresses to primary Google Account email
   // addresses.
   ExecOrDie(dbhandle,
             "CREATE TABLE signins"
             " (signin, primary_email, "
@@ skipping 321 matching lines @@
   if (salt.empty() || hash == kInvalidHash)
     return false;
   MD5Calculator md5;
   md5.AddData(salt.data(), salt.size());
   md5.AddData(password.data(), password.size());
   return hash == GetHashFromDigest(md5.GetDigest());
 }
 
 void UserSettings::SwitchUser(const string& username) {
   {
-    AutoLock lock(mutex_);
+    base::AutoLock lock(mutex_);
     email_ = username;
   }
 }
 
 string UserSettings::GetClientId() {
   ScopedDBHandle dbhandle(this);
   SQLStatement statement;
   statement.prepare(dbhandle.get(), "SELECT id FROM client_id");
   int query_result = statement.step();
   string client_id;
@@ skipping 13 matching lines @@
   query.prepare(dbhandle.get(), "SELECT email FROM cookies");
   if (SQLITE_ROW == query.step()) {
     *username = query.column_string(0);
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace browser_sync