| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 690306f67bc8591ca6eecda133aff3c1d3b86043..9c418ca238cbd621115198b34568fd218c4b57f0 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -180,7 +180,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| Optional<bool> enable_spdy_ping_based_connection_checking;
|
| Optional<net::NextProto> spdy_default_protocol;
|
| net::NextProtoVector next_protos;
|
| - Optional<string> trusted_spdy_proxy;
|
| + Optional<std::string> trusted_spdy_proxy;
|
| Optional<bool> force_spdy_over_ssl;
|
| Optional<bool> force_spdy_always;
|
| std::set<net::HostPortPair> forced_spdy_exclusions;
|
|
|