| Index: sync/sessions/sync_session.h
|
| diff --git a/sync/sessions/sync_session.h b/sync/sessions/sync_session.h
|
| index be66e15c0adabe088558a86f8f6553fd77dbaf05..0763ea68ffbafe51c3ec73e7ffa817d1bb9e7ecf 100644
|
| --- a/sync/sessions/sync_session.h
|
| +++ b/sync/sessions/sync_session.h
|
| @@ -11,13 +11,13 @@
|
| #define SYNC_SESSIONS_SYNC_SESSION_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <set>
|
| #include <string>
|
| #include <utility>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "sync/base/sync_export.h"
|
| #include "sync/engine/sync_cycle_event.h"
|
| @@ -132,7 +132,7 @@ class SYNC_EXPORT SyncSession {
|
| Delegate* const delegate_;
|
|
|
| // Our controller for various status and error counters.
|
| - scoped_ptr<StatusController> status_controller_;
|
| + std::unique_ptr<StatusController> status_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SyncSession);
|
| };
|
|
|