Get rid of websocket_over_spdy_enabled global.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 6feb06432746c92731ce7350a7c6d9adf856bbc6..4f554291ba7b98f90db3a533483085fa0ca0991c 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -181,6 +181,8 @@ 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;
+
+    Optional<bool> enable_websocket_over_spdy;

[James Hawkins, 2014/05/30 17:30:07]

Can you move this to the spdy block above?  Like maybe line 169 + \n.

[mmenke, 2014/05/30 17:45:30]

Done.  I was thinking of it as a new websocket block, but may make more sense
with the SPDY stuff.

   };
 
   // |net_log| must either outlive the IOThread or be NULL.