| Index: components/sync/device_info/device_info_data_type_controller_unittest.cc
|
| diff --git a/components/sync/device_info/device_info_data_type_controller_unittest.cc b/components/sync/device_info/device_info_data_type_controller_unittest.cc
|
| index 6d04d5f7c539a3a688a8eac3ce9156f5f3986b2e..27c572f20ec7102e44e9bb3685135b2e7da8c1f3 100644
|
| --- a/components/sync/device_info/device_info_data_type_controller_unittest.cc
|
| +++ b/components/sync/device_info/device_info_data_type_controller_unittest.cc
|
| @@ -42,7 +42,7 @@ class DeviceInfoDataTypeControllerTest : public testing::Test {
|
| }
|
|
|
| void TearDown() override {
|
| - controller_ = NULL;
|
| + controller_ = nullptr;
|
| local_device_.reset();
|
| }
|
|
|
| @@ -118,7 +118,7 @@ TEST_F(DeviceInfoDataTypeControllerTest, DestructionWithDelayedStart) {
|
| // Destroy |local_device_| and |controller_| out of order
|
| // to verify that the controller doesn't crash in the destructor.
|
| local_device_.reset();
|
| - controller_ = NULL;
|
| + controller_ = nullptr;
|
| }
|
|
|
| } // namespace
|
|
|