Revert 68696 - Disable SPDY by default as a test to see if heap corruption go...

net/http/http_network_layer.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_network_layer.h"
 
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "net/http/http_network_session.h"
@@ skipping 240 matching lines @@
       HttpAlternateProtocols::PortProtocolPair pair;
       pair.port = 443;
       pair.protocol = HttpAlternateProtocols::NPN_SPDY_2;
       HttpAlternateProtocols::ForceAlternateProtocol(pair);
     } else if (option.empty() && it == spdy_options.begin()) {
       continue;
     } else {
       LOG(DFATAL) << "Unrecognized spdy option: " << option;
     }
   }
-
-  // TODO(willchan): Re-enable SPDY after a canary release goes out
-  // with SPDY off.
-  HttpStreamFactory::set_spdy_enabled(false);
 }
-
 }  // namespace net