OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
281 &value); | 281 &value); |
282 net::SpdySessionPool::set_max_sessions_per_domain(value); | 282 net::SpdySessionPool::set_max_sessions_per_domain(value); |
283 } | 283 } |
284 | 284 |
285 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); | 285 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); |
286 | 286 |
287 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { | 287 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { |
288 // Enable WebSocket over SPDY. | 288 // Enable WebSocket over SPDY. |
289 net::WebSocketJob::set_websocket_over_spdy_enabled(true); | 289 net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
290 } | 290 } |
| 291 |
| 292 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) |
| 293 net::HttpStreamFactory::set_http_pipelining_enabled(true); |
291 } | 294 } |
292 | 295 |
293 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { | 296 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { |
294 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( | 297 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( |
295 true); | 298 true); |
296 | 299 |
297 // TODO(joi): Passing the NetLog here is temporary; once I switch the | 300 // TODO(joi): Passing the NetLog here is temporary; once I switch the |
298 // URLRequestThrottlerManager to be part of the URLRequestContext it will | 301 // URLRequestThrottlerManager to be part of the URLRequestContext it will |
299 // come from there. Doing it this way for now (2011/5/12) to try to fail | 302 // come from there. Doing it this way for now (2011/5/12) to try to fail |
300 // fast in case A/B experiment gives unexpected results. | 303 // fast in case A/B experiment gives unexpected results. |
(...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2038 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2041 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
2039 (pre_read == "0" || pre_read == "1")) { | 2042 (pre_read == "0" || pre_read == "1")) { |
2040 std::string uma_name(name); | 2043 std::string uma_name(name); |
2041 uma_name += "_PreRead"; | 2044 uma_name += "_PreRead"; |
2042 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2045 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
2043 AddPreReadHistogramTime(uma_name.c_str(), time); | 2046 AddPreReadHistogramTime(uma_name.c_str(), time); |
2044 } | 2047 } |
2045 #endif | 2048 #endif |
2046 #endif | 2049 #endif |
2047 } | 2050 } |
OLD | NEW |