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

chrome/browser/sync/util/user_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_
 #define CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_
 #pragma once
 
 #include <map>
 #include <string>
 
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "build/build_config.h"
 
 extern "C" struct sqlite3;
 
 class FilePath;
 
 namespace browser_sync {
 
 void ExecOrDie(sqlite3* dbhandle, const char *query);
 std::string APEncode(const std::string& in);
@@ skipping 49 matching lines @@
 
   // Get a unique ID suitable for use as the client ID.  This ID has the
   // lifetime of the user settings database.  You may use this ID if your
   // operating environment does not provide its own unique client ID.
   std::string GetClientId();
 
  protected:
   struct ScopedDBHandle {
     explicit ScopedDBHandle(UserSettings* settings);
     inline sqlite3* get() const { return *handle_; }
-    AutoLock mutex_lock_;
+    base::AutoLock mutex_lock_;
     sqlite3** const handle_;
   };
 
   friend struct ScopedDBHandle;
   friend class URLFactory;
 
   void MigrateOldVersionsAsNeeded(sqlite3* const handle, int current_version);
 
  private:
   std::string email_;
-  mutable Lock mutex_;  // protects email_.
+  mutable base::Lock mutex_;  // protects email_.
 
   // We keep a single dbhandle.
   sqlite3* dbhandle_;
-  Lock dbhandle_mutex_;
+  base::Lock dbhandle_mutex_;
 
   // TODO(sync): Use in-memory cache for service auth tokens on posix.
   // Have someone competent in Windows switch it over to not use Sqlite in the
   // future.
 #ifndef OS_WIN
   typedef std::map<std::string, std::string> ServiceTokenMap;
   ServiceTokenMap service_tokens_;
 #endif  // OS_WIN
 
   DISALLOW_COPY_AND_ASSIGN(UserSettings);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_USER_SETTINGS_H_