| 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_);
|
| }
|
|
|