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

Unified Diff: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc

Issue 2461463002: [Sync] Replacing NULL with nullptr/null throughout sync code. (Closed)
Patch Set: Reverted PROFILE_nullptr mistake. Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
diff --git a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
index b153b173e879be8eb0a510d442f0f6b21312c2a3..11e35ef315a9d6316815258f98c946ca4e5770d7 100644
--- a/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
+++ b/chrome/browser/sync/sessions/sessions_sync_manager_unittest.cc
@@ -188,7 +188,7 @@ class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
void NotifyLocalChangeObservers() {
const syncer::SyncChange empty_change;
for (syncer::LocalChangeObserver& observer : local_change_observers_)
- observer.OnLocalChange(NULL, empty_change);
+ observer.OnLocalChange(nullptr, empty_change);
}
void FailProcessSyncChangesWith(const syncer::SyncError& error) {
@@ -308,8 +308,7 @@ class SyncSessionsClientShim : public SyncSessionsClient {
class SessionsSyncManagerTest
: public BrowserWithTestWindowTest {
protected:
- SessionsSyncManagerTest()
- : test_processor_(NULL) {
+ SessionsSyncManagerTest() : test_processor_(nullptr) {
local_device_ = base::MakeUnique<LocalDeviceInfoProviderMock>(
"cache_guid", "Wayne Gretzky's Hacking Box", "Chromium 10k",
"Chrome 10k", sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id");
@@ -335,7 +334,7 @@ class SessionsSyncManagerTest
}
void TearDown() override {
- test_processor_ = NULL;
+ test_processor_ = nullptr;
helper()->Reset();
sync_prefs_.reset();
manager_.reset();
@@ -363,7 +362,7 @@ class SessionsSyncManagerTest
}
void InitWithNoSyncData() {
- InitWithSyncDataTakeOutput(syncer::SyncDataList(), NULL);
+ InitWithSyncDataTakeOutput(syncer::SyncDataList(), nullptr);
}
void TriggerProcessSyncChangesError() {
@@ -818,7 +817,7 @@ TEST_F(SessionsSyncManagerTest, SetVariationIds) {
const variations::VariationID kVariationId2 = 3300300;
const variations::VariationID kVariationId3 = 3300400;
- base::FieldTrialList field_trial_list(NULL);
+ base::FieldTrialList field_trial_list(nullptr);
CreateAndActivateFieldTrial("trial name 1", "group name", kVariationId1,
variations::CHROME_SYNC_SERVICE);
CreateAndActivateFieldTrial("trial name 2", "group name", kVariationId2,
« no previous file with comments | « chrome/browser/sync/sessions/notification_service_sessions_router.cc ('k') | chrome/browser/sync/sync_error_notifier_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698