| Index: components/sync/driver/frontend_data_type_controller.cc
|
| diff --git a/components/sync/driver/frontend_data_type_controller.cc b/components/sync/driver/frontend_data_type_controller.cc
|
| index 8b24a6f5d935da23a3b119a235112a02302ceb9b..56da9101769b7a571efa09cae62fd4f3bd4db1c3 100644
|
| --- a/components/sync/driver/frontend_data_type_controller.cc
|
| +++ b/components/sync/driver/frontend_data_type_controller.cc
|
| @@ -100,7 +100,7 @@ void FrontendDataTypeController::Stop() {
|
| error = model_associator()->DisassociateModels();
|
| }
|
|
|
| - set_model_associator(NULL);
|
| + set_model_associator(nullptr);
|
| change_processor_.reset();
|
|
|
| state_ = NOT_RUNNING;
|
| @@ -185,7 +185,7 @@ void FrontendDataTypeController::CleanUpState() {
|
|
|
| void FrontendDataTypeController::CleanUp() {
|
| CleanUpState();
|
| - set_model_associator(NULL);
|
| + set_model_associator(nullptr);
|
| change_processor_.reset();
|
| }
|
|
|
|
|