Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(37)

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed)

Created:
6 years, 7 months ago by mmenke
Modified:
6 years, 5 months ago
CC:
chromium-reviews, cbentzel+watch_chromium.org, eroman, android-webview-reviews_chromium.org
Visibility:
Public.

Description

Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. Instead, each HttpNetworkSession is given its own immutable copies on construction. Other than spdy_enabled, none of the globals were changed before this CL, anyways. Also, setting spdy_enabled back to true after setting it to false no longer clears the NPN list. spdy_enabled is still a global because group policy can set it to false at runtime. BUG=372533 R=joaodasilva@chromium.org, rch@chromium.org, sergeyu@chromium.org, sgurun@chromium.org, sky@chromium.org, ttuttle@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272698

Patch Set 1 #

Patch Set 2 : Merge, fix stuff #

Patch Set 3 : Merge, fix more stuff #

Patch Set 4 : Move comment to avoid merge conflicts #

Total comments: 8

Patch Set 5 : Move lineabreak #

Total comments: 2

Patch Set 6 : Merge #

Patch Set 7 : Fix merge #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1261 lines, -1302 lines) Patch
M android_webview/browser/net/aw_url_request_context_getter.cc View 1 2 3 chunks +6 lines, -4 lines 0 comments Download
M chrome/browser/io_thread.h View 1 2 1 chunk +7 lines, -0 lines 0 comments Download
M chrome/browser/io_thread.cc View 1 2 3 4 5 3 chunks +24 lines, -13 lines 0 comments Download
M chrome/browser/net/preconnect.cc View 1 chunk +1 line, -2 lines 0 comments Download
M chrome/browser/policy/url_blacklist_manager_unittest.cc View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/ui/webui/net_internals/net_internals_ui.cc View 1 2 1 chunk +9 lines, -8 lines 0 comments Download
M components/cronet/android/url_request_context_peer.cc View 2 chunks +1 line, -2 lines 0 comments Download
M components/domain_reliability/uploader_unittest.cc View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M jingle/glue/proxy_resolving_client_socket.cc View 1 2 3 4 2 chunks +9 lines, -0 lines 0 comments Download
M net/http/http_network_session.h View 1 2 3 1 chunk +253 lines, -222 lines 0 comments Download
M net/http/http_network_session.cc View 1 2 3 1 chunk +308 lines, -254 lines 0 comments Download
M net/http/http_network_transaction.cc View 1 2 3 4 5 4 chunks +8 lines, -11 lines 0 comments Download
M net/http/http_network_transaction_unittest.cc View 27 chunks +41 lines, -44 lines 0 comments Download
M net/http/http_stream_factory.h View 1 2 1 chunk +250 lines, -315 lines 0 comments Download
M net/http/http_stream_factory.cc View 1 2 3 4 1 chunk +99 lines, -247 lines 0 comments Download
M net/http/http_stream_factory_impl.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M net/http/http_stream_factory_impl_job.h View 1 2 3 4 5 1 chunk +0 lines, -6 lines 0 comments Download
M net/http/http_stream_factory_impl_job.cc View 1 2 3 4 5 3 chunks +7 lines, -7 lines 0 comments Download
M net/http/http_stream_factory_impl_unittest.cc View 2 chunks +1 line, -15 lines 0 comments Download
M net/net.gypi View 1 2 3 4 5 1 chunk +1 line, -0 lines 0 comments Download
M net/quic/quic_network_transaction_unittest.cc View 1 2 3 4 5 6 25 chunks +26 lines, -40 lines 0 comments Download
M net/socket/next_proto.h View 2 chunks +17 lines, -0 lines 0 comments Download
A net/socket/next_proto.cc View 1 chunk +52 lines, -0 lines 0 comments Download
M net/spdy/spdy_network_transaction_unittest.cc View 1 2 3 4 5 6 chunks +43 lines, -37 lines 0 comments Download
M net/spdy/spdy_test_util_common.h View 2 chunks +8 lines, -2 lines 0 comments Download
M net/spdy/spdy_test_util_common.cc View 5 chunks +17 lines, -3 lines 0 comments Download
M net/test/net_test_suite.cc View 1 2 1 chunk +67 lines, -67 lines 0 comments Download
M net/websockets/websocket_stream.cc View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 23 (0 generated)
mmenke
Ryan: I've tried to keep code changes to a minimum in this CL, beyond moving ...
6 years, 7 months ago (2014-05-22 14:51:12 UTC) #1
sgurun-gerrit only
On 2014/05/22 14:51:12, mmenke wrote: > Ryan: I've tried to keep code changes to a ...
6 years, 7 months ago (2014-05-22 15:49:52 UTC) #2
Ryan Hamilton
LGTM. Looks great. It's too bad the spdy_enabled thing needs to stay static, but that's ...
6 years, 7 months ago (2014-05-22 17:30:45 UTC) #3
mmenke
Thanks for the feedback! https://codereview.chromium.org/284423002/diff/330001/net/http/http_network_session.cc File net/http/http_network_session.cc (right): https://codereview.chromium.org/284423002/diff/330001/net/http/http_network_session.cc#newcode152 net/http/http_network_session.cc:152: for (int i = ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION; ...
6 years, 7 months ago (2014-05-22 20:12:16 UTC) #4
mmenke
[+sky]: Mind signing off on the io_thread changes? [+sanjeevr]: Please review jingle/glue (Just copying network ...
6 years, 7 months ago (2014-05-22 20:40:35 UTC) #5
mmenke
[+sky]: Mind signing off on the io_thread changes? [+sanjeevr]: Please review jingle/glue (Just copying network ...
6 years, 7 months ago (2014-05-22 20:40:35 UTC) #6
mmenke
[+joaodasilva]: This also fixes an include-what-you-use issue in chrome/browser/policy/url_blacklist_manager_unittest.cc. If you want to review, feel ...
6 years, 7 months ago (2014-05-22 20:41:40 UTC) #7
sky
LGTM
6 years, 7 months ago (2014-05-22 21:43:17 UTC) #8
Deprecated (see juliatuttle)
On 2014/05/22 20:40:35, mmenke wrote: > [+ttuttle]: Please review components/domain_reliability (Fix minor > include-what-you-use issue, ...
6 years, 7 months ago (2014-05-22 22:58:56 UTC) #9
Joao da Silva
policy lgtm
6 years, 7 months ago (2014-05-23 06:48:48 UTC) #10
mmenke
[+sergeyu, -sanjeevr]: Please review jingle/glue/proxy_resolving_client_socket.cc. Should sanjeevr be removed from jingle's OWNERS file? Looks like ...
6 years, 7 months ago (2014-05-23 14:31:22 UTC) #11
mmenke
On 2014/05/23 14:31:22, mmenke wrote: > [+sergeyu, -sanjeevr]: Please review > jingle/glue/proxy_resolving_client_socket.cc. Should sanjeevr be ...
6 years, 7 months ago (2014-05-23 14:32:59 UTC) #12
Sergey Ulanov
LGTM https://codereview.chromium.org/284423002/diff/240029/jingle/glue/proxy_resolving_client_socket.cc File jingle/glue/proxy_resolving_client_socket.cc (right): https://codereview.chromium.org/284423002/diff/240029/jingle/glue/proxy_resolving_client_socket.cc#newcode74 jingle/glue/proxy_resolving_client_socket.cc:74: // prone. Should have a better way to ...
6 years, 7 months ago (2014-05-23 22:02:20 UTC) #13
Sergey Ulanov
On 2014/05/23 14:31:22, mmenke wrote: > [+sergeyu, -sanjeevr]: Please review > jingle/glue/proxy_resolving_client_socket.cc. Should sanjeevr be ...
6 years, 7 months ago (2014-05-23 22:03:21 UTC) #14
mmenke
Thanks for the reviews! https://codereview.chromium.org/284423002/diff/240029/jingle/glue/proxy_resolving_client_socket.cc File jingle/glue/proxy_resolving_client_socket.cc (right): https://codereview.chromium.org/284423002/diff/240029/jingle/glue/proxy_resolving_client_socket.cc#newcode74 jingle/glue/proxy_resolving_client_socket.cc:74: // prone. Should have a ...
6 years, 7 months ago (2014-05-23 22:06:57 UTC) #15
mmenke
The CQ bit was checked by mmenke@chromium.org
6 years, 7 months ago (2014-05-23 22:07:04 UTC) #16
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mmenke@chromium.org/284423002/240029
6 years, 7 months ago (2014-05-23 22:09:00 UTC) #17
mmenke
The CQ bit was checked by mmenke@chromium.org
6 years, 7 months ago (2014-05-23 23:15:31 UTC) #18
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mmenke@chromium.org/284423002/350001
6 years, 7 months ago (2014-05-23 23:17:26 UTC) #19
mmenke
The CQ bit was checked by mmenke@chromium.org
6 years, 7 months ago (2014-05-23 23:46:27 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mmenke@chromium.org/284423002/370001
6 years, 7 months ago (2014-05-23 23:49:00 UTC) #21
mmenke
Committed patchset #7 manually as r272698 (presubmit successful).
6 years, 7 months ago (2014-05-24 03:38:46 UTC) #22
Ryan Hamilton
6 years, 5 months ago (2014-07-02 19:33:10 UTC) #23
Message was sent while issue was closed.
Curiously, this seems to have converted http_stream_factory to DOS line endings.
 I'll attempt to fix this in https://codereview.chromium.org/365973004/

Powered by Google App Engine
This is Rietveld 408576698