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

Unified Diff: chrome/browser/sync/test/integration/profile_sync_service_harness.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/test/integration/profile_sync_service_harness.cc
diff --git a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
index e9c2cee6cef0753adb9c2ce109e07f55b477a895..6a4b4ce228a660f6ded16d3e0067e16dae7ee69a 100644
--- a/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
+++ b/chrome/browser/sync/test/integration/profile_sync_service_harness.cc
@@ -147,7 +147,7 @@ bool ProfileSyncServiceHarness::SetupSync(
<< "SetupSync should not be used for legacy supervised users.";
// Initialize the sync client's profile sync service object.
- if (service() == NULL) {
+ if (service() == nullptr) {
LOG(ERROR) << "SetupSync(): service() is null.";
return false;
}
@@ -308,7 +308,7 @@ void ProfileSyncServiceHarness::FinishSyncSetup() {
}
SyncCycleSnapshot ProfileSyncServiceHarness::GetLastCycleSnapshot() const {
- DCHECK(service() != NULL) << "Sync service has not yet been set up.";
+ DCHECK(service() != nullptr) << "Sync service has not yet been set up.";
if (service()->IsSyncActive()) {
return service()->GetLastCycleSnapshot();
}
@@ -324,7 +324,7 @@ bool ProfileSyncServiceHarness::EnableSyncForDatatype(
if (IsSyncDisabled())
return SetupSync(syncer::ModelTypeSet(datatype));
- if (service() == NULL) {
+ if (service() == nullptr) {
LOG(ERROR) << "EnableSyncForDatatype(): service() is null.";
return false;
}
@@ -357,7 +357,7 @@ bool ProfileSyncServiceHarness::DisableSyncForDatatype(
"DisableSyncForDatatype("
+ std::string(syncer::ModelTypeToString(datatype)) + ")");
- if (service() == NULL) {
+ if (service() == nullptr) {
LOG(ERROR) << "DisableSyncForDatatype(): service() is null.";
return false;
}
@@ -390,7 +390,7 @@ bool ProfileSyncServiceHarness::EnableSyncForAllDatatypes() {
if (IsSyncDisabled())
return SetupSync();
- if (service() == NULL) {
+ if (service() == nullptr) {
LOG(ERROR) << "EnableSyncForAllDatatypes(): service() is null.";
return false;
}
@@ -409,7 +409,7 @@ bool ProfileSyncServiceHarness::EnableSyncForAllDatatypes() {
bool ProfileSyncServiceHarness::DisableSyncForAllDatatypes() {
DVLOG(1) << GetClientInfoString("DisableSyncForAllDatatypes");
- if (service() == NULL) {
+ if (service() == nullptr) {
LOG(ERROR) << "DisableSyncForAllDatatypes(): service() is null.";
return false;
}

Powered by Google App Engine
This is Rietveld 408576698