| Index: components/sync/driver/model_association_manager_unittest.cc
|
| diff --git a/components/sync/driver/model_association_manager_unittest.cc b/components/sync/driver/model_association_manager_unittest.cc
|
| index 023a633a571423e350459daa8518a187984cc5bb..ebb576b54b82effe8255820ff0da1cf420778db8 100644
|
| --- a/components/sync/driver/model_association_manager_unittest.cc
|
| +++ b/components/sync/driver/model_association_manager_unittest.cc
|
| @@ -36,7 +36,7 @@ FakeDataTypeController* GetController(
|
| ModelType model_type) {
|
| DataTypeController::TypeMap::const_iterator it = controllers.find(model_type);
|
| if (it == controllers.end()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| return static_cast<FakeDataTypeController*>(it->second.get());
|
| }
|
|
|