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

chrome/browser/sync/engine/syncer.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_ENGINE_SYNCER_H_
 #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/gtest_prod_util.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
+#include "base/synchronization/lock.h"
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 #include "chrome/browser/sync/engine/syncer_types.h"
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_event.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/util/extensions_activity_monitor.h"
 #include "chrome/common/deprecated/event_sys.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
 
@@ skipping 75 matching lines @@
 
   // This is the bottom-most SyncShare variant, and does not cause transient
   // state to be reset in session.
   // Like SyncShare(), but |first_step| and |last_step| are provided to perform
   // a partial sync cycle, stopping after |last_step| is performed.
   void SyncShare(sessions::SyncSession* session,
                  SyncerStep first_step,
                  SyncerStep last_step);
 
   bool early_exit_requested_;
-  Lock early_exit_requested_lock_;
+  base::Lock early_exit_requested_lock_;
 
   int32 max_commit_batch_size_;
 
   ConflictResolver resolver_;
 
   // A callback hook used in unittests to simulate changes between conflict set
   // building and conflict resolution.
   Callback0::Type* pre_conflict_resolution_closure_;
 
   friend class SyncerTest;
@@ skipping 44 matching lines @@
   }
   return false;
 }
 // Utility function declarations.
 void CopyServerFields(syncable::Entry* src, syncable::MutableEntry* dest);
 void ClearServerData(syncable::MutableEntry* entry);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCER_H_