Do not use Alternate-Protocol for establishing new SpdySessions.

Only use Alternate-Protocol for latching onto existing SpdySessions.
This is a temporary change until SSL improvements are made, so we
can begin sending http over spdy when available.

Note that we have to do proxy resolution one time to figure out how to check for the appropriate existing SpdySession.  If no SpdySession exists, we fallback again and have to redo proxy resolution (since the alternate protocol of npn-spdy requires rewriting the URI from http:// to https://).  So we may end up doing two proxy resolutions in the fallback case.

I had to disable all the tests that test establishing a new
SpdySession for http:// URIs, since we don't do that for now.

BUG=none
TEST=none

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

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

1 files changed, 9 insertions, 1 deletions

diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index 804ef35..db50038 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -89,6 +89,14 @@ class HttpStreamFactory : public StreamFactory,
     return ignore_certificate_errors_;
   }
 
+  static void set_create_new_spdy_session_for_http(bool value) {
+    g_create_new_spdy_session_for_http_ = value;
+  }
+
+  static bool create_new_spdy_session_for_http() {
+    return g_create_new_spdy_session_for_http_;
+  }
+
   static void SetHostMappingRules(const std::string& rules);
 
  private:
@@ -100,6 +108,7 @@ class HttpStreamFactory : public StreamFactory,
   static bool force_spdy_over_ssl_;
   static bool force_spdy_always_;
   static bool ignore_certificate_errors_;
+  static bool g_create_new_spdy_session_for_http_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
 };
@@ -107,4 +116,3 @@ class HttpStreamFactory : public StreamFactory,
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_H_
-