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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 &value); | 286 &value); |
287 net::SpdySessionPool::set_max_sessions_per_domain(value); | 287 net::SpdySessionPool::set_max_sessions_per_domain(value); |
288 } | 288 } |
289 | 289 |
290 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); | 290 SetDnsCertProvenanceCheckerFactory(CreateChromeDnsCertProvenanceChecker); |
291 | 291 |
292 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { | 292 if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy)) { |
293 // Enable WebSocket over SPDY. | 293 // Enable WebSocket over SPDY. |
294 net::WebSocketJob::set_websocket_over_spdy_enabled(true); | 294 net::WebSocketJob::set_websocket_over_spdy_enabled(true); |
295 } | 295 } |
| 296 |
| 297 if (parsed_command_line.HasSwitch(switches::kEnableHttpPipelining)) |
| 298 net::HttpStreamFactory::set_http_pipelining_enabled(true); |
296 } | 299 } |
297 | 300 |
298 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { | 301 void InitializeURLRequestThrottlerManager(net::NetLog* net_log) { |
299 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( | 302 net::URLRequestThrottlerManager::GetInstance()->set_enable_thread_checks( |
300 true); | 303 true); |
301 | 304 |
302 // TODO(joi): Passing the NetLog here is temporary; once I switch the | 305 // TODO(joi): Passing the NetLog here is temporary; once I switch the |
303 // URLRequestThrottlerManager to be part of the URLRequestContext it will | 306 // URLRequestThrottlerManager to be part of the URLRequestContext it will |
304 // come from there. Doing it this way for now (2011/5/12) to try to fail | 307 // come from there. Doing it this way for now (2011/5/12) to try to fail |
305 // fast in case A/B experiment gives unexpected results. | 308 // fast in case A/B experiment gives unexpected results. |
(...skipping 1792 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2098 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && | 2101 if (env->GetVar(chrome::kPreReadEnvironmentVariable, &pre_read) && |
2099 (pre_read == "0" || pre_read == "1")) { | 2102 (pre_read == "0" || pre_read == "1")) { |
2100 std::string uma_name(name); | 2103 std::string uma_name(name); |
2101 uma_name += "_PreRead"; | 2104 uma_name += "_PreRead"; |
2102 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; | 2105 uma_name += pre_read == "1" ? "Enabled" : "Disabled"; |
2103 AddPreReadHistogramTime(uma_name.c_str(), time); | 2106 AddPreReadHistogramTime(uma_name.c_str(), time); |
2104 } | 2107 } |
2105 #endif | 2108 #endif |
2106 #endif | 2109 #endif |
2107 } | 2110 } |
OLD | NEW |