| Index: chrome/browser/chromeos/login/login_utils.cc
|
| diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc
|
| index 708f2e4ba98b9ca6235ca34bf02197bcad872a6c..64da8651bbfd0917f72d5f8ad5cd3098832e11c0 100644
|
| --- a/chrome/browser/chromeos/login/login_utils.cc
|
| +++ b/chrome/browser/chromeos/login/login_utils.cc
|
| @@ -9,12 +9,12 @@
|
| #include "base/command_line.h"
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| -#include "base/lock.h"
|
| #include "base/path_service.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/singleton.h"
|
| #include "base/string_util.h"
|
| #include "base/stringprintf.h"
|
| +#include "base/synchronization/lock.h"
|
| #include "base/time.h"
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browser_process.h"
|
| @@ -160,7 +160,7 @@ class LoginUtilsWrapper {
|
| }
|
|
|
| LoginUtils* get() {
|
| - AutoLock create(create_lock_);
|
| + base::AutoLock create(create_lock_);
|
| if (!ptr_.get())
|
| reset(new LoginUtilsImpl);
|
| return ptr_.get();
|
| @@ -175,7 +175,7 @@ class LoginUtilsWrapper {
|
|
|
| LoginUtilsWrapper() {}
|
|
|
| - Lock create_lock_;
|
| + base::Lock create_lock_;
|
| scoped_ptr<LoginUtils> ptr_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LoginUtilsWrapper);
|
|
|