GitLab

Almost all consumers use already scoped_ptr
and one place is much simpler when changed to use scoped_ptr.

Review URL: https://codereview.chromium.org/1549483004

Cr-Commit-Position: refs/heads/master@{#367062}