Reland net-related fixups for scoped_refptr conversion operator cleanup.

BUG=110610
TBR=mmenke@chromium.org,pkasting@chromium.org,rsleevi@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#293231}
15 files changed