| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 1f969ec4a63fce5acf8c46d0cb821f4e939e9454..f197841cd62b42a274f3eb1418b899d53f61096b 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -59,6 +59,7 @@ class NetworkDelegate;
|
| class ProxyConfigService;
|
| class ProxyService;
|
| class SSLConfigService;
|
| +class SSLSocketConfigService;
|
| class TransportSecurityState;
|
| class URLRequestContext;
|
| class URLRequestContextGetter;
|
| @@ -198,6 +199,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // main frame load fails with a DNS error in order to provide more useful
|
| // information to the renderer so it can show a more specific error page.
|
| scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
|
| + scoped_ptr<net::SSLSocketConfigService> ssl_socket_config_service;
|
| };
|
|
|
| // |net_log| must either outlive the IOThread or be NULL.
|
| @@ -308,6 +310,10 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // well as the QUIC field trial group.
|
| void ConfigureQuic(const base::CommandLine& command_line);
|
|
|
| + // Configures SSLSocketConfigService based on the flags in |command_line| as
|
| + // well as the ClientHello field trial group.
|
| + void ConfigureSSLSocketConfigService(const base::CommandLine& command_line);
|
| +
|
| extensions::EventRouterForwarder* extension_event_router_forwarder() {
|
| #if defined(ENABLE_EXTENSIONS)
|
| return extension_event_router_forwarder_;
|
| @@ -396,6 +402,13 @@ class IOThread : public content::BrowserThreadDelegate {
|
| const base::CommandLine& command_line,
|
| const VariationParameters& quic_trial_params);
|
|
|
| + // Configures the SSLSocketConfigService in |globals| based on the flags in
|
| + // |command_line| as well as the ClientHello field trial group.
|
| + static void ConfigureSSLSocketConfigServiceGlobals(
|
| + const base::CommandLine& command_line,
|
| + base::StringPiece client_hello_trial_group,
|
| + Globals* globals);
|
| +
|
| // The NetLog is owned by the browser process, to allow logging from other
|
| // threads during shutdown, but is used most frequently on the IOThread.
|
| ChromeNetLog* net_log_;
|
|
|