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

chrome/browser/chromeos/login/camera.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_CHROMEOS_LOGIN_CAMERA_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_CAMERA_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
-#include "base/lock.h"
 #include "base/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class Task;
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace chromeos {
 
@@ skipping 150 matching lines @@
   int frame_height_;
 
   // If set to true, the returned image will be reflected from the Y axis to
   // mimic mirror behavior.
   bool mirrored_;
 
   // Image where camera frames are stored for UI thread to pick up.
   SkBitmap frame_image_;
 
   // Lock that guards references to |frame_image_|.
-  mutable Lock image_lock_;
+  mutable base::Lock image_lock_;
 
   // Lock that guards references to |camera_thread_|.
-  mutable Lock thread_lock_;
+  mutable base::Lock thread_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(Camera);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_CAMERA_H_