Local discovery fixups for scoped_refptr operator T* removal.

BUG=110610

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

Cr-Commit-Position: refs/heads/master@{#292436}
3 files changed