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

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_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
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index 251c9e4276c69029ae5c4fc43024e57ef663b929..01550305bbdd90ae8a6ad6c82bc764f57e40d75d 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -119,12 +119,12 @@ class DriveBackendSyncTest : public testing::Test,
worker_task_runner_.get(),
drive_task_runner.get(),
base_dir_.path(),
- NULL, // task_logger
- NULL, // notification_manager
- NULL, // extension_service
- NULL, // signin_manager
- NULL, // token_service
- NULL, // request_context
+ nullptr, // task_logger
+ nullptr, // notification_manager
+ nullptr, // extension_service
+ nullptr, // signin_manager
+ nullptr, // token_service
+ nullptr, // request_context
scoped_ptr<SyncEngine::DriveServiceFactory>(),
in_memory_env_.get()));
remote_sync_service_->AddServiceObserver(this);
@@ -1217,7 +1217,7 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFolder_AddFolder) {
EXPECT_EQ(google_apis::HTTP_CREATED,
fake_drive_service_helper()->AddFolder(
app_root_folder_id,
- "conflict_to_existing_remote", NULL));
+ "conflict_to_existing_remote", nullptr));
EXPECT_EQ(SYNC_STATUS_OK, ProcessChangesUntilDone());
VerifyConsistency();
@@ -1280,14 +1280,15 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFolder_AddFile) {
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_service_helper()->AddFile(
- app_root_folder_id, "conflict_to_pending_remote", "foo", NULL));
+ app_root_folder_id, "conflict_to_pending_remote", "foo",
+ nullptr));
FetchRemoteChanges();
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_service_helper()->AddFile(
app_root_folder_id, "conflict_to_existing_remote", "bar",
- NULL));
+ nullptr));
EXPECT_EQ(SYNC_STATUS_OK, ProcessChangesUntilDone());
VerifyConsistency();
@@ -1554,13 +1555,13 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFile_AddFolder) {
EXPECT_EQ(google_apis::HTTP_CREATED,
fake_drive_service_helper()->AddFolder(
- app_root_folder_id, "conflict_to_pending_remote", NULL));
+ app_root_folder_id, "conflict_to_pending_remote", nullptr));
FetchRemoteChanges();
EXPECT_EQ(google_apis::HTTP_CREATED,
fake_drive_service_helper()->AddFolder(
- app_root_folder_id, "conflict_to_existing_remote", NULL));
+ app_root_folder_id, "conflict_to_existing_remote", nullptr));
EXPECT_EQ(SYNC_STATUS_OK, ProcessChangesUntilDone());
VerifyConsistency();
@@ -1629,14 +1630,14 @@ TEST_F(DriveBackendSyncTest, ConflictTest_DeleteFile_AddFile) {
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_service_helper()->AddFile(
app_root_folder_id, "conflict_to_pending_remote", "hoge",
- NULL));
+ nullptr));
FetchRemoteChanges();
EXPECT_EQ(google_apis::HTTP_SUCCESS,
fake_drive_service_helper()->AddFile(
app_root_folder_id, "conflict_to_existing_remote", "fuga",
- NULL));
+ nullptr));
EXPECT_EQ(SYNC_STATUS_OK, ProcessChangesUntilDone());
VerifyConsistency();

Powered by Google App Engine
This is Rietveld 408576698