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

Unified Diff: sync/engine/directory_commit_contribution_unittest.cc

Issue 1866243002: Convert //sync 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: sync/engine/directory_commit_contribution_unittest.cc
diff --git a/sync/engine/directory_commit_contribution_unittest.cc b/sync/engine/directory_commit_contribution_unittest.cc
index 64252841d2a6bca6202abdd7b56da93919eb0989..41e5cf4d79dfa0da2a6923b3955ae5f4b484ce76 100644
--- a/sync/engine/directory_commit_contribution_unittest.cc
+++ b/sync/engine/directory_commit_contribution_unittest.cc
@@ -129,7 +129,7 @@ TEST_F(DirectoryCommitContributionTest, GatherByTypes) {
}
DirectoryTypeDebugInfoEmitter emitter(PREFERENCES, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> cc(
+ std::unique_ptr<DirectoryCommitContribution> cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 5, &emitter));
ASSERT_EQ(2U, cc->GetNumEntries());
@@ -155,7 +155,7 @@ TEST_F(DirectoryCommitContributionTest, GatherAndTruncate) {
}
DirectoryTypeDebugInfoEmitter emitter(PREFERENCES, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> cc(
+ std::unique_ptr<DirectoryCommitContribution> cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 1, &emitter));
ASSERT_EQ(1U, cc->GetNumEntries());
@@ -179,9 +179,9 @@ TEST_F(DirectoryCommitContributionTest, PrepareCommit) {
DirectoryTypeDebugInfoEmitter emitter1(PREFERENCES, &type_observers_);
DirectoryTypeDebugInfoEmitter emitter2(EXTENSIONS, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> pref_cc(
+ std::unique_ptr<DirectoryCommitContribution> pref_cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 25, &emitter1));
- scoped_ptr<DirectoryCommitContribution> ext_cc(
+ std::unique_ptr<DirectoryCommitContribution> ext_cc(
DirectoryCommitContribution::Build(dir(), EXTENSIONS, 25, &emitter2));
sync_pb::ClientToServerMessage message;
@@ -232,7 +232,7 @@ TEST_F(DirectoryCommitContributionTest, DeletedItemsWithSpecifics) {
}
DirectoryTypeDebugInfoEmitter emitter(PREFERENCES, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> pref_cc(
+ std::unique_ptr<DirectoryCommitContribution> pref_cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 25, &emitter));
ASSERT_TRUE(pref_cc);
@@ -274,7 +274,7 @@ TEST_F(DirectoryCommitContributionTest, DeletedBookmarksWithSpecifics) {
}
DirectoryTypeDebugInfoEmitter emitter(BOOKMARKS, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> bm_cc(
+ std::unique_ptr<DirectoryCommitContribution> bm_cc(
DirectoryCommitContribution::Build(dir(), BOOKMARKS, 25, &emitter));
ASSERT_TRUE(bm_cc);
@@ -316,7 +316,7 @@ TEST_F(DirectoryCommitContributionTest, HierarchySupport_Bookmark) {
}
DirectoryTypeDebugInfoEmitter emitter(BOOKMARKS, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> bm_cc(
+ std::unique_ptr<DirectoryCommitContribution> bm_cc(
DirectoryCommitContribution::Build(dir(), BOOKMARKS, 25, &emitter));
sync_pb::ClientToServerMessage message;
@@ -342,7 +342,7 @@ TEST_F(DirectoryCommitContributionTest, HierarchySupport_Preferences) {
}
DirectoryTypeDebugInfoEmitter emitter(PREFERENCES, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> pref_cc(
+ std::unique_ptr<DirectoryCommitContribution> pref_cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 25, &emitter));
sync_pb::ClientToServerMessage message;
@@ -378,9 +378,9 @@ TEST_F(DirectoryCommitContributionTest, ProcessCommitResponse) {
DirectoryTypeDebugInfoEmitter emitter1(PREFERENCES, &type_observers_);
DirectoryTypeDebugInfoEmitter emitter2(EXTENSIONS, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> pref_cc(
+ std::unique_ptr<DirectoryCommitContribution> pref_cc(
DirectoryCommitContribution::Build(dir(), PREFERENCES, 25, &emitter1));
- scoped_ptr<DirectoryCommitContribution> ext_cc(
+ std::unique_ptr<DirectoryCommitContribution> ext_cc(
DirectoryCommitContribution::Build(dir(), EXTENSIONS, 25, &emitter2));
sync_pb::ClientToServerMessage message;
@@ -465,7 +465,7 @@ TEST_F(DirectoryCommitContributionTest, ProcessCommitResponseWithAttachments) {
}
DirectoryTypeDebugInfoEmitter emitter(ARTICLES, &type_observers_);
- scoped_ptr<DirectoryCommitContribution> art_cc(
+ std::unique_ptr<DirectoryCommitContribution> art_cc(
DirectoryCommitContribution::Build(dir(), ARTICLES, 25, &emitter));
// Only art1 is ready.

Powered by Google App Engine
This is Rietveld 408576698