Revert of Remove a scoped_refptr<>::swap overload

Revert of Remove a scoped_refptr<>::swap overload (patchset #4 id:60001 of https://codereview.chromium.org/2723083004/ )

Reason for revert:
Broke https://build.chromium.org/p/chromium.android/builders/Android%20x64%20Builder%20%28dbg%29/builds/15131

Original issue's description:
> Remove a scoped_refptr<>::swap overload
>
> A scoped_refptr<>::swap overload is used to insert or remove the internal
> pointer without manipulating the ref count. That functionality should not
> be exposed, or at least, should be exposed separately with better name.
>
> This CL removes the swap() overload, and rewrites callers without swap().
>
> Review-Url: https://codereview.chromium.org/2723083004
> Cr-Commit-Position: refs/heads/master@{#455407}
> Committed: https://chromium.googlesource.com/chromium/src/+/511c810d540422faf221bd82a4532313cabcc4c4

TBR=dcheng@chromium.org,jkarlin@chromium.org,xhwang@chromium.org,tzik@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2732063005
Cr-Commit-Position: refs/heads/master@{#455456}
Committed: https://chromium.googlesource.com/chromium/src/+/ae6bbc0f6bed9bb278889e3548b3a7fa1d9e84ef

[estevenson, 2017-03-08 15:24:07]

Created Revert of Remove a scoped_refptr<>::swap overload

[estevenson, 2017-03-08 15:30:31]

The CQ bit was checked by estevenson@chromium.org

[commit-bot: I haz the power, 2017-03-08 15:30:51]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-08 15:31:36]

CQ is committing da patch.

Bot data: {"patchset_id": 1, "attempt_start_ts": 1488987031167600, "parent_rev":
"2c656e7549443124d7c13dce0b808a1f19cd0df4", "commit_rev":
"ae6bbc0f6bed9bb278889e3548b3a7fa1d9e84ef"}

[commit-bot: I haz the power, 2017-03-08 15:32:54]

Description was changed from

==========
Revert of Remove a scoped_refptr<>::swap overload (patchset #4 id:60001 of
https://codereview.chromium.org/2723083004/ )

Reason for revert:
Broke
https://build.chromium.org/p/chromium.android/builders/Android%20x64%20Builde...

Original issue's description:
> Remove a scoped_refptr<>::swap overload
> 
> A scoped_refptr<>::swap overload is used to insert or remove the internal
> pointer without manipulating the ref count. That functionality should not
> be exposed, or at least, should be exposed separately with better name.
> 
> This CL removes the swap() overload, and rewrites callers without swap().
> 
> Review-Url: https://codereview.chromium.org/2723083004
> Cr-Commit-Position: refs/heads/master@{#455407}
> Committed:
https://chromium.googlesource.com/chromium/src/+/511c810d540422faf221bd82a453...

TBR=dcheng@chromium.org,jkarlin@chromium.org,xhwang@chromium.org,tzik@chromiu...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
==========

to

==========
Revert of Remove a scoped_refptr<>::swap overload (patchset #4 id:60001 of
https://codereview.chromium.org/2723083004/ )

Reason for revert:
Broke
https://build.chromium.org/p/chromium.android/builders/Android%20x64%20Builde...

Original issue's description:
> Remove a scoped_refptr<>::swap overload
>
> A scoped_refptr<>::swap overload is used to insert or remove the internal
> pointer without manipulating the ref count. That functionality should not
> be exposed, or at least, should be exposed separately with better name.
>
> This CL removes the swap() overload, and rewrites callers without swap().
>
> Review-Url: https://codereview.chromium.org/2723083004
> Cr-Commit-Position: refs/heads/master@{#455407}
> Committed:
https://chromium.googlesource.com/chromium/src/+/511c810d540422faf221bd82a453...

TBR=dcheng@chromium.org,jkarlin@chromium.org,xhwang@chromium.org,tzik@chromiu...
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2732063005
Cr-Commit-Position: refs/heads/master@{#455456}
Committed:
https://chromium.googlesource.com/chromium/src/+/ae6bbc0f6bed9bb278889e3548b3...
==========

[commit-bot: I haz the power, 2017-03-08 15:32:56]

Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/ae6bbc0f6bed9bb278889e3548b3...