| Index: components/sync_bookmarks/bookmark_model_associator.cc
|
| diff --git a/components/sync_bookmarks/bookmark_model_associator.cc b/components/sync_bookmarks/bookmark_model_associator.cc
|
| index d5d445f7b2f601294ccc00e819c3e8bb2371d405..fbf71304bd5b0ef6b51ee6e978be51313670d2a6 100644
|
| --- a/components/sync_bookmarks/bookmark_model_associator.cc
|
| +++ b/components/sync_bookmarks/bookmark_model_associator.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "components/sync_bookmarks/bookmark_model_associator.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/containers/hash_tables.h"
|
| @@ -454,7 +456,7 @@ syncer::SyncError BookmarkModelAssociator::AssociateModels(
|
| if (error.IsSet())
|
| return error;
|
|
|
| - scoped_ptr<ScopedAssociationUpdater> association_updater(
|
| + std::unique_ptr<ScopedAssociationUpdater> association_updater(
|
| new ScopedAssociationUpdater(bookmark_model_));
|
| DisassociateModels();
|
|
|
|
|