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

Side by Side Diff: chrome/browser/sync_file_system/local/local_file_change_tracker_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, 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h" 5 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"
6 6
7 #include <deque> 7 #include <deque>
8 #include <set> 8 #include <set>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 base::ThreadTaskRunnerHandle::Get().get(), 52 base::ThreadTaskRunnerHandle::Get().get(),
53 base::ThreadTaskRunnerHandle::Get().get()); 53 base::ThreadTaskRunnerHandle::Get().get());
54 ASSERT_EQ( 54 ASSERT_EQ(
55 sync_file_system::SYNC_STATUS_OK, 55 sync_file_system::SYNC_STATUS_OK,
56 file_system_.MaybeInitializeFileSystemContext(sync_context_.get())); 56 file_system_.MaybeInitializeFileSystemContext(sync_context_.get()));
57 } 57 }
58 58
59 virtual void TearDown() OVERRIDE { 59 virtual void TearDown() OVERRIDE {
60 if (sync_context_.get()) 60 if (sync_context_.get())
61 sync_context_->ShutdownOnUIThread(); 61 sync_context_->ShutdownOnUIThread();
62 sync_context_ = NULL; 62 sync_context_ = nullptr;
63 63
64 message_loop_.RunUntilIdle(); 64 message_loop_.RunUntilIdle();
65 file_system_.TearDown(); 65 file_system_.TearDown();
66 // Make sure we don't leave the external filesystem. 66 // Make sure we don't leave the external filesystem.
67 // (CannedSyncableFileSystem::TearDown does not do this as there may be 67 // (CannedSyncableFileSystem::TearDown does not do this as there may be
68 // multiple syncable file systems registered for the name) 68 // multiple syncable file systems registered for the name)
69 RevokeSyncableFileSystem(); 69 RevokeSyncableFileSystem();
70 } 70 }
71 71
72 protected: 72 protected:
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 705
706 // Make sure they're gone from the database too. 706 // Make sure they're gone from the database too.
707 DropChangesInTracker(); 707 DropChangesInTracker();
708 RestoreChangesFromTrackerDB(); 708 RestoreChangesFromTrackerDB();
709 709
710 GetAllChangedURLs(&urls); 710 GetAllChangedURLs(&urls);
711 EXPECT_TRUE(urls.empty()); 711 EXPECT_TRUE(urls.empty());
712 } 712 }
713 713
714 } // namespace sync_file_system 714 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698