Revert r77399 in preparation for merging a small portion of it to 696.

Reland r77075,r77077.

They were reverted due to flaky tests, especially on valgrind. Basically, we kept hitting the backup socket timer (500ms) which would create another socket, which the tests don't expect, so they crash. I disabled the backup socket timer completely for the SPDY tests, because they make it too hard to handle the parallel alternate protocol jobs.

I also deleted the HTTP fallback test from SpdyNetworkTransactionTest, because it had a similar problem. Also, it was already being tested in HttpNetworkTransactionTest.

BUG=69688,75000
TEST=Try connecting to belshe.com with various proxy configurations. Should work still.

Review URL: http://codereview.chromium.org/6635047

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/6681012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77864 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 7 deletions

diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h
index b43bf13..4bdbfca 100644
--- a/net/http/http_stream_factory_impl.h
+++ b/net/http/http_stream_factory_impl.h
@@ -7,9 +7,9 @@
 
 #include <map>
 #include <set>
+#include <string>
 
 #include "base/ref_counted.h"
-#include "net/base/host_port_pair.h"
 #include "net/http/http_stream_factory.h"
 #include "net/base/net_log.h"
 #include "net/proxy/proxy_server.h"
@@ -35,8 +35,8 @@ class HttpStreamFactoryImpl : public HttpStreamFactory {
                                  const HttpRequestInfo& info,
                                  const SSLConfig& ssl_config,
                                  const BoundNetLog& net_log);
-  virtual void AddTLSIntolerantServer(const HostPortPair& server);
-  virtual bool IsTLSIntolerantServer(const HostPortPair& server) const;
+  virtual void AddTLSIntolerantServer(const GURL& url);
+  virtual bool IsTLSIntolerantServer(const GURL& url) const;
 
  private:
   class Request;
@@ -45,9 +45,6 @@ class HttpStreamFactoryImpl : public HttpStreamFactory {
   typedef std::set<Request*> RequestSet;
   typedef std::map<HostPortProxyPair, RequestSet> SpdySessionRequestMap;
 
-  bool GetAlternateProtocolRequestFor(const GURL& original_url,
-                                      GURL* alternate_url) const;
-
   // Detaches |job| from |request|.
   void OrphanJob(Job* job, const Request* request);
 
@@ -58,6 +55,7 @@ class HttpStreamFactoryImpl : public HttpStreamFactory {
                           bool direct,
                           const SSLConfig& used_ssl_config,
                           const ProxyInfo& used_proxy_info,
+                          bool was_alternate_protocol_available,
                           bool was_npn_negotiated,
                           bool using_spdy,
                           const NetLog::Source& source);
@@ -78,7 +76,7 @@ class HttpStreamFactoryImpl : public HttpStreamFactory {
 
   HttpNetworkSession* const session_;
 
-  std::set<HostPortPair> tls_intolerant_servers_;
+  std::set<std::string> tls_intolerant_servers_;
 
   // All Requests are handed out to clients. By the time HttpStreamFactoryImpl
   // is destroyed, all Requests should be deleted (which should remove them from