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

chrome/browser/sync/util/channel.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_CHANNEL_H_
 #define CHROME_BROWSER_SYNC_UTIL_CHANNEL_H_
 #pragma once
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 32 matching lines @@
 //       channel_.Notify(event);
 //     }
 //
 //    private:
 //     Channel<FooEvent> channel_;
 //   };
 //
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "base/lock.h"
 #include "base/observer_list.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/platform_thread.h"
 
 namespace browser_sync {
 
 template <typename EventType>
 class Channel;
 
 class EventHandler {
 };
 
@@ skipping 26 matching lines @@
 
 template <typename EventType>
 class Channel {
  public:
   typedef ObserverListBase<EventHandler> ChannelObserverList;
 
   Channel() : locking_thread_(0) {}
 
   ChannelHookup<EventType>* AddObserver(
       ChannelEventHandler<EventType>* observer) {
-    AutoLock scoped_lock(event_handlers_mutex_);
+    base::AutoLock scoped_lock(event_handlers_mutex_);
     event_handlers_.AddObserver(observer);
     return new ChannelHookup<EventType>(this, observer);
   }
 
   void RemoveObserver(ChannelEventHandler<EventType>* observer) {
     // This can be called in response to a notification, so we may already have
     // locked this channel on this thread.
     bool need_lock = (locking_thread_ != base::PlatformThread::CurrentId());
     if (need_lock)
       event_handlers_mutex_.Acquire();
 
     event_handlers_mutex_.AssertAcquired();
     event_handlers_.RemoveObserver(observer);
     if (need_lock)
       event_handlers_mutex_.Release();
   }
 
   void Notify(const EventType& event) {
-    AutoLock scoped_lock(event_handlers_mutex_);
+    base::AutoLock scoped_lock(event_handlers_mutex_);
 
     // This may result in an observer trying to remove itself, so keep track
     // of the thread we're locked on.
     locking_thread_ = base::PlatformThread::CurrentId();
 
     ChannelObserverList::Iterator it(event_handlers_);
     EventHandler* obs;
     while ((obs = it.GetNext()) != NULL) {
       static_cast<ChannelEventHandler<EventType>* >(obs)->
           HandleChannelEvent(event);
     }
 
     // Set back to an invalid thread id.
     locking_thread_ = 0;
   }
 
  private:
-  Lock event_handlers_mutex_;
+  base::Lock event_handlers_mutex_;
   base::PlatformThreadId locking_thread_;
   ObserverList<EventHandler> event_handlers_;
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_CHANNEL_H_