| Index: chrome/common/mac/mock_launchd.h
|
| diff --git a/chrome/common/mac/mock_launchd.h b/chrome/common/mac/mock_launchd.h
|
| index 64d37ace460f39226277d5ccc447b80c73db7b66..4d056c79e78e17f34397ff02326442a487d75c17 100644
|
| --- a/chrome/common/mac/mock_launchd.h
|
| +++ b/chrome/common/mac/mock_launchd.h
|
| @@ -7,11 +7,11 @@
|
|
|
| #include <launch.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/mac/scoped_cftyperef.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/common/mac/launchd.h"
|
| #include "chrome/common/multi_process_lock.h"
|
|
|
| @@ -60,7 +60,7 @@ class MockLaunchd : public Launchd {
|
| base::FilePath file_;
|
| std::string pipe_name_;
|
| base::MessageLoop* message_loop_;
|
| - scoped_ptr<MultiProcessLock> running_lock_;
|
| + std::unique_ptr<MultiProcessLock> running_lock_;
|
| bool create_socket_;
|
| bool as_service_;
|
| bool restart_called_;
|
|
|