Delete benchmarking extension, remove API's ability to enable/disable SPDY

chrome/browser/chrome_net_benchmarking_message_filter.cc

Index: chrome/browser/chrome_net_benchmarking_message_filter.cc
diff --git a/chrome/browser/chrome_net_benchmarking_message_filter.cc b/chrome/browser/chrome_net_benchmarking_message_filter.cc
index 5e18e5b7bccca0bd7752c4af3fd8dc6069396573..35c771c2e6c93a52728dee02756c71ea7278108b 100644
--- a/chrome/browser/chrome_net_benchmarking_message_filter.cc
+++ b/chrome/browser/chrome_net_benchmarking_message_filter.cc
@@ -19,8 +19,6 @@
 #include "net/dns/host_cache.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_network_layer.h"
-#include "net/http/http_stream_factory.h"
 
 namespace {
 
@@ -54,7 +52,6 @@ bool ChromeNetBenchmarkingMessageFilter::OnMessageReceived(
     IPC_MESSAGE_HANDLER_DELAY_REPLY(ChromeViewHostMsg_ClearCache, OnClearCache)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ClearHostResolverCache,
                         OnClearHostResolverCache)
-    IPC_MESSAGE_HANDLER(ChromeViewHostMsg_EnableSpdy, OnEnableSpdy)
     IPC_MESSAGE_HANDLER(ChromeViewHostMsg_ClearPredictorCache,
                         OnClearPredictorCache)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -102,23 +99,6 @@ void ChromeNetBenchmarkingMessageFilter::OnClearHostResolverCache(int* result) {
   }
 }
 
-// TODO(lzheng): This only enables spdy over ssl. Enable spdy for http
-// when needed.
-void ChromeNetBenchmarkingMessageFilter::OnEnableSpdy(bool enable) {
-  // This function is disabled unless the user has enabled
-  // benchmarking extensions.
-  if (!CheckBenchmarkingEnabled()) {
-    NOTREACHED() << "Received unexpected benchmarking IPC";
-    return;
-  }
-  if (enable) {
-    net::HttpStreamFactory::EnableNpnSpdy3();
-    net::HttpNetworkLayer::ForceAlternateProtocol();
-  } else {
-    net::HttpStreamFactory::EnableNpnHttpOnly();
-  }
-}
-
 void ChromeNetBenchmarkingMessageFilter::OnCloseCurrentConnections() {
   // This function is disabled unless the user has enabled
   // benchmarking extensions.