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

Unified Diff: chrome/browser/sync_file_system/local/syncable_file_operation_runner_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/local/syncable_file_operation_runner_unittest.cc
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
index 4f8634f38eecf672e35a62f2f9d3bf4f6b9a88ff..d367ab05fb2139d7120f10078949e1a4b11fdf4c 100644
--- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
+++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
@@ -84,7 +84,7 @@ class SyncableFileOperationRunnerTest : public testing::Test {
virtual void TearDown() OVERRIDE {
if (sync_context_.get())
sync_context_->ShutdownOnUIThread();
- sync_context_ = NULL;
+ sync_context_ = nullptr;
file_system_.TearDown();
RevokeSyncableFileSystem();
@@ -346,7 +346,7 @@ TEST_F(SyncableFileOperationRunnerTest, QueueAndCancel) {
// This shouldn't crash nor leak memory.
sync_context_->ShutdownOnUIThread();
- sync_context_ = NULL;
+ sync_context_ = nullptr;
base::MessageLoop::current()->RunUntilIdle();
EXPECT_EQ(2, callback_count_);
}

Powered by Google App Engine
This is Rietveld 408576698