| Index: chrome/browser/sync/test/integration/sync_datatype_helper.cc
|
| diff --git a/chrome/browser/sync/test/integration/sync_datatype_helper.cc b/chrome/browser/sync/test/integration/sync_datatype_helper.cc
|
| index 7921e10c979290e21e6c388b5a1ded37864aacac..b6a22429c18e7281ff4bba0ad7d8b063d054e8c0 100644
|
| --- a/chrome/browser/sync/test/integration/sync_datatype_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/sync_datatype_helper.cc
|
| @@ -9,20 +9,20 @@
|
| namespace {
|
|
|
| // The SyncTest instance associated with sync_datatype_helper.
|
| -static SyncTest* test = NULL;
|
| +static SyncTest* test = nullptr;
|
|
|
| } // namespace
|
|
|
| namespace sync_datatype_helper {
|
|
|
| void AssociateWithTest(SyncTest* test) {
|
| - ASSERT_TRUE(test != NULL) << "Cannot associate with null test.";
|
| - ASSERT_TRUE(::test == NULL) << "Already associated with a test.";
|
| + ASSERT_TRUE(test != nullptr) << "Cannot associate with null test.";
|
| + ASSERT_TRUE(::test == nullptr) << "Already associated with a test.";
|
| ::test = test;
|
| }
|
|
|
| SyncTest* test() {
|
| - EXPECT_TRUE(::test != NULL) << "Must call AssociateWithTest first.";
|
| + EXPECT_TRUE(::test != nullptr) << "Must call AssociateWithTest first.";
|
| return ::test;
|
| }
|
|
|
|
|