chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc - Issue 610223002: [SyncFS] Use nullptr instead of NULL

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 | « chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc ('k') | chrome/browser/sync_file_system/drive_backend/sync_engine.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

index 3b0b97525fa2542533b3bacb63f7fdbeab3a094b..c531de90d59d0e5ca7e5044917a38f8058b7739e 100644

--- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc

@@ -72,7 +72,7 @@ class RemoteToLocalSyncerTest : public testing::Test {

context_.reset(new SyncEngineContext(

fake_drive_service.PassAs<drive::DriveServiceInterface>(),

drive_uploader.Pass(),

- NULL,

+ nullptr,

base::ThreadTaskRunnerHandle::Get(),

base::ThreadTaskRunnerHandle::Get()));

context_->SetRemoteChangeProcessor(remote_change_processor_.get());

@@ -381,7 +381,7 @@ TEST_F(RemoteToLocalSyncerTest, Conflict_CreateFileOnFolder) {

VerifyConsistency();

// Tracker for the remote file should has low priority.

- EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(NULL));

+ EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(nullptr));

EXPECT_TRUE(GetMetadataDatabase()->HasDemotedDirtyTracker());

}

@@ -446,7 +446,7 @@ TEST_F(RemoteToLocalSyncerTest, Conflict_CreateFileOnFile) {

VerifyConsistency();

// Tracker for the remote file should be lowered.

- EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(NULL));

+ EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(nullptr));

EXPECT_TRUE(GetMetadataDatabase()->HasDemotedDirtyTracker());

}