Fix a translate infobar test to more correctly test what it's supposed to.

BUG=none
TEST=none
R=hajimehoshi@chromium.org, jam@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237387 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 237387
Clean up RenderViewHostManager swapping logic.

Makes the difference between swapping SiteInstances and swapping
BrowsingInstances explicit.

BUG=123007
TEST=No functionality change.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237388 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 237388
net: fix PORT_Assert crash when renegotiating.

r235826 added a test when sending the ChannelID extension which is
nonsense in at least two different ways.

Firstly, it PORT_Asserts when it doesn't match, which is wrong because it's not
an exceptional condition. The handshake hash is only stored in the session if
ChannelID was negotiated so this should have been crashing on every,
non-ChannelID resume.

The reason that it didn't crash was because the isResuming flag that it used
wasn't set until the ServerHello was processed. So the only time when it did
crash was on renegotiation after a resumption.

This change fixes the resumption test and removes the assert. I think the
resumption test is needed because it's possible that a server could deploy
ChannelID between the initial handshake and a resumption attempt.

BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237389 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 237389