net: rework the NPN patch.

net/http/http_stream_factory.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_HTTP_HTTP_STREAM_FACTORY_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_H_
 
 #include <list>
 #include <string>
+#include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "net/base/completion_callback.h"
 #include "net/base/load_states.h"
 #include "net/base/net_export.h"
 
 class GURL;
 
 namespace net {
@@ skipping 153 matching lines @@
 
   virtual void AddTLSIntolerantServer(const HostPortPair& server) = 0;
   virtual bool IsTLSIntolerantServer(const HostPortPair& server) const = 0;
 
   // Static settings
   static GURL ApplyHostMappingRules(const GURL& url, HostPortPair* endpoint);
 
   // Turns spdy on or off.
   static void set_spdy_enabled(bool value) {
     spdy_enabled_ = value;
-    if (value == false)
-      set_next_protos("");
+    if (!spdy_enabled_) {
+      delete next_protos_;
+      next_protos_ = NULL;
+    }
   }
   static bool spdy_enabled() { return spdy_enabled_; }
 
   // Controls whether or not we use the Alternate-Protocol header.
   static void set_use_alternate_protocols(bool value) {
     use_alternate_protocols_ = value;
   }
   static bool use_alternate_protocols() { return use_alternate_protocols_; }
 
   // Controls whether or not we use ssl when in spdy mode.
   static void set_force_spdy_over_ssl(bool value) {
     force_spdy_over_ssl_ = value;
   }
   static bool force_spdy_over_ssl() {
     return force_spdy_over_ssl_;
   }
 
   // Controls whether or not we use spdy without npn.
   static void set_force_spdy_always(bool value) {
     force_spdy_always_ = value;
   }
   static bool force_spdy_always() { return force_spdy_always_; }
 
   // Add a URL to exclude from forced SPDY.
   static void add_forced_spdy_exclusion(const std::string& value);
   // Check if a HostPortPair is excluded from using spdy.
   static bool HasSpdyExclusion(const HostPortPair& endpoint);
 
   // Sets the next protocol negotiation value used during the SSL handshake.
-  static void set_next_protos(const std::string& value) {
-    delete next_protos_;
-    next_protos_ = new std::string(value);
+  static void set_next_protos(const std::vector<std::string>& value) {
+    if (!next_protos_)
+      next_protos_ = new std::vector<std::string>;
+    *next_protos_ = value;
   }
-  static const std::string* next_protos() { return next_protos_; }
+  static bool has_next_protos() { return next_protos_ != NULL; }
+  static const std::vector<std::string>& next_protos() {
+    return *next_protos_;
+  }
 
   // Sets the HttpStreamFactoryImpl into a mode where it can ignore certificate
   // errors.  This is for testing.
   static void set_ignore_certificate_errors(bool value) {
     ignore_certificate_errors_ = value;
   }
   static bool ignore_certificate_errors() {
     return ignore_certificate_errors_;
   }
 
   static void SetHostMappingRules(const std::string& rules);
 
  protected:
   HttpStreamFactory();
 
  private:
   static const HostMappingRules& host_mapping_rules();
 
   static const HostMappingRules* host_mapping_rules_;
-  static const std::string* next_protos_;
+  static std::vector<std::string>* next_protos_;
   static bool spdy_enabled_;
   static bool use_alternate_protocols_;
   static bool force_spdy_over_ssl_;
   static bool force_spdy_always_;
   static std::list<HostPortPair>* forced_spdy_exclusions_;
   static bool ignore_certificate_errors_;
 
   DISALLOW_COPY_AND_ASSIGN(HttpStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_H_