| Index: chrome/browser/chromeos/login/camera.h
|
| diff --git a/chrome/browser/chromeos/login/camera.h b/chrome/browser/chromeos/login/camera.h
|
| index c30f2dfbec1646b38197c6055cb808410c4b48ca..9b51088648f539bde1417515399a22817b9a2b77 100644
|
| --- a/chrome/browser/chromeos/login/camera.h
|
| +++ b/chrome/browser/chromeos/login/camera.h
|
| @@ -9,8 +9,8 @@
|
| #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"
|
|
|
| @@ -181,10 +181,10 @@ class Camera : public base::RefCountedThreadSafe<Camera> {
|
| 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);
|
| };
|
|
|