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

Unified Diff: components/sync/syncable/directory_unittest.cc

Issue 2427803002: [Sync] Replacing NULL with nullptr in code and null in comments for components/sync/ (Closed)
Patch Set: Fixing start of sentence capitlization. Created 4 years, 2 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
« no previous file with comments | « components/sync/syncable/directory_backing_store_unittest.cc ('k') | components/sync/syncable/entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/sync/syncable/directory_unittest.cc
diff --git a/components/sync/syncable/directory_unittest.cc b/components/sync/syncable/directory_unittest.cc
index 04a635793c1868d9875a7179201dcb99f483e7a2..161f1c19670b14eb8a0baa62a6c1ffeaf3b46440 100644
--- a/components/sync/syncable/directory_unittest.cc
+++ b/components/sync/syncable/directory_unittest.cc
@@ -1346,8 +1346,8 @@ TEST_F(SyncableDirectoryTest, PositionWithNullSurvivesSaveAndReload) {
const char null_cstr[] = "\0null\0test";
std::string null_str(null_cstr, arraysize(null_cstr) - 1);
// Pad up to the minimum length with 0x7f characters, then add a string that
- // contains a few NULLs to the end. This is slightly wrong, since the suffix
- // part of a UniquePosition shouldn't contain NULLs, but it's good enough for
+ // contains a few nulls to the end. This is slightly wrong, since the suffix
+ // part of a UniquePosition shouldn't contain nulls, but it's good enough for
// this test.
std::string suffix =
std::string(UniquePosition::kSuffixLength - null_str.length(), '\x7f') +
@@ -1621,7 +1621,7 @@ TEST_F(SyncableDirectoryTest, ToValue) {
Entry e(&rtrans, GET_BY_ID, id);
EXPECT_FALSE(e.good()); // Hasn't been written yet.
- std::unique_ptr<base::DictionaryValue> value(e.ToValue(NULL));
+ std::unique_ptr<base::DictionaryValue> value(e.ToValue(nullptr));
ExpectDictBooleanValue(false, *value, "good");
EXPECT_EQ(1u, value->size());
}
@@ -1634,7 +1634,7 @@ TEST_F(SyncableDirectoryTest, ToValue) {
me.PutId(id);
me.PutBaseVersion(1);
- std::unique_ptr<base::DictionaryValue> value(me.ToValue(NULL));
+ std::unique_ptr<base::DictionaryValue> value(me.ToValue(nullptr));
ExpectDictBooleanValue(true, *value, "good");
EXPECT_TRUE(value->HasKey("kernel"));
ExpectDictStringValue("Bookmarks", *value, "modelType");
« no previous file with comments | « components/sync/syncable/directory_backing_store_unittest.cc ('k') | components/sync/syncable/entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698