Clean up NPN/ALPN-related SSLClientSocket bits.

Clean up NPN/ALPN-related SSLClientSocket bits.

A follow-up will unvirtual and disentangle the other virtual functions there.
Have SSLClientSocket implement ALPN-related methods internally using
GetNextProto rather than rely on SSLConnectJob to do it.

The SPDY-related bit is removed and moved up to callers. Also clean up the
MockSSLClientSocket overrides of these functions now that the setters are never
called outside of the SSLClientSocket implementation. Instead,
SSLSocketDataProvider supplies the input to MockSSLClientSocket::GetNextProto
and then the usual logic computes everything else from there.

BUG=477847
Committed: https://crrev.com/6974bf71b37bddb36ca8b1feefc013b7c47c105f
Cr-Commit-Position: refs/heads/master@{#327066}

[davidben, 2015-04-17 19:12:43]

davidben@chromium.org changed reviewers:
+ rsleevi@chromium.org

[Ryan Sleevi, 2015-04-17 19:19:29]

rsleevi@chromium.org changed reviewers:
+ rch@chromium.org

[Ryan Sleevi, 2015-04-17 19:19:29]

rsleevi@chromium.org changed required reviewers:
+ rch@chromium.org

[Ryan Sleevi, 2015-04-17 19:19:30]

LGTM, but just double check with rch@ that the socket pool logic is correct (I
think it is)

https://codereview.chromium.org/1097773003/diff/20001/net/socket/ssl_client_s...
File net/socket/ssl_client_socket_pool.cc (left):

https://codereview.chromium.org/1097773003/diff/20001/net/socket/ssl_client_s...
net/socket/ssl_client_socket_pool.cc:343: // If we want spdy over npn, make sure
it succeeded.
Kinda sad to lose this comment?

[davidben, 2015-04-17 19:43:10]

davidben@chromium.org changed reviewers:
+ jyasskin@chromium.org

[davidben, 2015-04-17 19:43:11]

+jyasskin for chrome/browser/extensions/api/socket/tls_socket_unittest.cc

https://codereview.chromium.org/1097773003/diff/20001/net/socket/ssl_client_s...
File net/socket/ssl_client_socket_pool.cc (left):

https://codereview.chromium.org/1097773003/diff/20001/net/socket/ssl_client_s...
net/socket/ssl_client_socket_pool.cc:343: // If we want spdy over npn, make sure
it succeeded.
On 2015/04/17 19:19:30, Ryan Sleevi wrote:
> Kinda sad to lose this comment?

Oh. Yeah, that comment was attached to the wrong block anyway. Fixed. (Note:
everything here that says NPN actually means NPN or ALPN. I've left that alone
for the most part.)

[Jeffrey Yasskin, 2015-04-17 20:37:10]

extensions lgtm.

[davidben, 2015-04-24 22:44:30]

rch: friendly ping

[Ryan Hamilton, 2015-04-27 15:19:33]

LGTM sorry for the delay

[davidben, 2015-04-27 16:06:27]

The CQ bit was checked by davidben@chromium.org

[davidben, 2015-04-27 16:06:28]

The patchset sent to the CQ was uploaded after l-g-t-m from rsleevi@chromium.org
Link to the patchset: https://codereview.chromium.org/1097773003/#ps60001
(title: "rsleevi comment")

[davidben, 2015-04-27 16:06:35]

The CQ bit was checked by davidben@chromium.org

[commit-bot: I haz the power, 2015-04-27 16:06:45]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1097773003/60001

[commit-bot: I haz the power, 2015-04-27 17:52:58]

Committed patchset #4 (id:60001)

[commit-bot: I haz the power, 2015-04-27 17:53:50]

Patchset 4 (id:??) landed as
https://crrev.com/6974bf71b37bddb36ca8b1feefc013b7c47c105f
Cr-Commit-Position: refs/heads/master@{#327066}