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

chrome/test/automation/automation_handle_tracker.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.
 
 // This file defines a mapping between Automation Proxy objects and
 // their associated app-side handles.
 
 #ifndef CHROME_TEST_AUTOMATION_AUTOMATION_HANDLE_TRACKER_H__
 #define CHROME_TEST_AUTOMATION_AUTOMATION_HANDLE_TRACKER_H__
 #pragma once
 
 #include <map>
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "ipc/ipc_channel.h"
 
 // This represents a value that the app's AutomationProvider returns
 // when asked for a resource (like a window or tab).
 typedef int AutomationHandle;
 
 class AutomationHandleTracker;
 class AutomationMessageSender;
 
 class AutomationResourceProxy
@@ skipping 72 matching lines @@
   }
 
  private:
   typedef
     std::map<AutomationHandle, scoped_refptr<AutomationResourceProxy> >
         HandleToObjectMap;
   typedef std::pair<AutomationHandle, AutomationResourceProxy*> MapEntry;
 
   HandleToObjectMap handle_to_object_;
 
-  Lock map_lock_;
+  base::Lock map_lock_;
   IPC::Channel* channel_;
   DISALLOW_COPY_AND_ASSIGN(AutomationHandleTracker);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_HANDLE_TRACKER_H__