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

base/synchronization/condition_variable.h

 // Copyright (c) 2011 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.
 
 // ConditionVariable wraps pthreads condition variable synchronization or, on
 // Windows, simulates it.  This functionality is very helpful for having
 // several threads wait for an event, as is common with a thread pool managed
 // by a master.  The meaning of such an event in the (worker) thread pool
 // scenario is that additional tasks are now available for processing.  It is
 // used in Chrome in the DNS prefetching system to notify worker threads that
@@ skipping 57 matching lines @@
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <pthread.h>
 #endif
 
 #include "base/basictypes.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 
 namespace base {
 
 class TimeDelta;
 
 class ConditionVariable {
  public:
   // Construct a cv for use with ONLY one user lock.
   explicit ConditionVariable(Lock* user_lock);
 
@@ skipping 60 matching lines @@
   // This helps with defensive destructor coding in the face of user error.
   enum RunState { SHUTDOWN = 0, RUNNING = 64213 };
 
   // Internal implementation methods supporting Wait().
   Event* GetEventForWaiting();
   void RecycleEvent(Event* used_event);
 
   RunState run_state_;
 
   // Private critical section for access to member data.
-  Lock internal_lock_;
+  base::Lock internal_lock_;
 
   // Lock that is acquired before calling Wait().
-  Lock& user_lock_;
+  base::Lock& user_lock_;
 
   // Events that threads are blocked on.
   Event waiting_list_;
 
   // Free list for old events.
   Event recycling_list_;
   int recycling_list_size_;
 
   // The number of allocated, but not yet deleted events.
   int allocation_counter_;
 
 #elif defined(OS_POSIX)
 
   pthread_cond_t condition_;
   pthread_mutex_t* user_mutex_;
 #if !defined(NDEBUG)
-  Lock* user_lock_;     // Needed to adjust shadow lock state on wait.
+  base::Lock* user_lock_;     // Needed to adjust shadow lock state on wait.
 #endif
 
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ConditionVariable);
 };
 
 }  // namespace base
 
 #endif  // BASE_SYNCHRONIZATION_CONDITION_VARIABLE_H_