Use std::unique_ptr rather than raw pointer (backport #3179)

Use std::unique_ptr rather than raw pointer (backport #3179) #2540