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

chrome/browser/renderer_host/render_widget_helper.h

 // Copyright (c) 2006-2008 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_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_
 #pragma once
 
 #include <map>
 
 #include "app/surface/transport_dib.h"
 #include "base/atomic_sequence_num.h"
 #include "base/hash_tables.h"
 #include "base/process.h"
 #include "base/ref_counted.h"
-#include "base/lock.h"
+#include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/common/window_container_type.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace base {
 class TimeDelta;
@@ skipping 163 matching lines @@
 
   // Called on the IO thread to resume a cross-site response.
   void OnCrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
 
 #if defined(OS_MACOSX)
   // Called on destruction to release all allocated transport DIBs
   void ClearAllocatedDIBs();
 
   // On OSX we keep file descriptors to all the allocated DIBs around until
   // the renderer frees them.
-  Lock allocated_dibs_lock_;
+  base::Lock allocated_dibs_lock_;
   std::map<TransportDIB::Id, int> allocated_dibs_;
 #endif
 
   // A map of live paint messages.  Must hold pending_paints_lock_ to access.
   // The UpdateMsgProxy objects are not owned by this map.  (See UpdateMsgProxy
   // for details about how the lifetime of instances are managed.)
   UpdateMsgProxyMap pending_paints_;
-  Lock pending_paints_lock_;
+  base::Lock pending_paints_lock_;
 
   int render_process_id_;
 
   // Event used to implement WaitForUpdateMsg.
   base::WaitableEvent event_;
 
   // The next routing id to use.
   base::AtomicSequenceNumber next_routing_id_;
 
   ResourceDispatcherHost* resource_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HELPER_H_