| Index: sync/engine/apply_control_data_updates_unittest.cc
|
| diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc
|
| index 505678f89079297ccf1144825fb7a69ccefdab0c..6c8c189fb9dd27cd971ccb3939afa970ff0a9c21 100644
|
| --- a/sync/engine/apply_control_data_updates_unittest.cc
|
| +++ b/sync/engine/apply_control_data_updates_unittest.cc
|
| @@ -7,12 +7,12 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/format_macros.h"
|
| #include "base/location.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "sync/engine/syncer.h"
|
| @@ -56,7 +56,8 @@ class ApplyControlDataUpdatesTest : public ::testing::Test {
|
| }
|
|
|
| TestIdFactory id_factory_;
|
| - scoped_ptr<TestEntryFactory> entry_factory_;
|
| + std::unique_ptr<TestEntryFactory> entry_factory_;
|
| +
|
| private:
|
| base::MessageLoop loop_; // Needed for directory init.
|
| TestDirectorySetterUpper dir_maker_;
|
|
|