Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: components/sync_bookmarks/bookmark_model_associator.cc

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();
« no previous file with comments | « components/sync_bookmarks/bookmark_data_type_controller_unittest.cc ('k') | components/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698