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