Modify the SPDY v1 hack to only advertise v1 and not v2 over NPN....

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/field_trial.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/http/http_network_session.h"
@@ skipping 133 matching lines @@
   static const char kEnableNpnHttpOnly[] = "npn-http";
 
   // Except for the first element, the order is irrelevant.  First element
   // specifies the fallback in case nothing matches
   // (SSLClientSocket::kNextProtoNoOverlap).  Otherwise, the SSL library
   // will choose the first overlapping protocol in the server's list, since
   // it presumedly has a better understanding of which protocol we should
   // use, therefore the rest of the ordering here is not important.
   static const char kNpnProtosFull[] = "\x08http/1.1\x06spdy/2";
   // This is a temporary hack to pretend we support version 1.
-  static const char kNpnProtosFullV1[] = "\x08http/1.1\x06spdy/1\x06spdy/2";
+  static const char kNpnProtosFullV1[] = "\x08http/1.1\x06spdy/1";
   // No spdy specified.
   static const char kNpnProtosHttpOnly[] = "\x08http/1.1\x07http1.1";
 
   std::vector<std::string> spdy_options;
   SplitString(mode, ',', &spdy_options);
 
   bool use_alt_protocols = true;
 
   for (std::vector<std::string>::iterator it = spdy_options.begin();
        it != spdy_options.end(); ++it) {
@@ skipping 24 matching lines @@
     } else if (option == kEnableFlowControl) {
       SpdySession::SetFlowControl(true);
     } else if (option.empty() && it == spdy_options.begin()) {
       continue;
     } else {
       LOG(DFATAL) << "Unrecognized spdy option: " << option;
     }
   }
 }
 }  // namespace net