Support parsing a Sec-WebSocket-Extensions header with multiple elements

net/websockets/websocket_extension_parser.h

Index: net/websockets/websocket_extension_parser.h
diff --git a/net/websockets/websocket_extension_parser.h b/net/websockets/websocket_extension_parser.h
index ef7fe0366575c696f039008d4989246f6b5b43a2..840bf6d012b95419298876c0dae1598c91cd975c 100644
--- a/net/websockets/websocket_extension_parser.h
+++ b/net/websockets/websocket_extension_parser.h
@@ -6,6 +6,7 @@
 #define NET_WEBSOCKETS_WEBSOCKET_EXTENSION_PARSER_H_
 
 #include <string>
+#include <vector>
 
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
@@ -18,23 +19,25 @@ class NET_EXPORT_PRIVATE WebSocketExtensionParser {
   WebSocketExtensionParser();
   ~WebSocketExtensionParser();
 
-  // Parses the given string as a WebSocket extension header value.
-  // This parser assumes some preprocesses are made.
-  //  - The parser parses single extension at a time. This means that
-  //    the parser parses |extension| in RFC6455 9.1, not |extension-list|.
-  //  - There is no newline characters in the input. LWS-concatenation must
-  //    have already been done.
+  // Parses the given string as a Sec-WebSocket-Extensions header value.
+  //
+  // There must be no newline characters in the input. LWS-concatenation must
+  // have already been done before calling this method.
   void Parse(const char* data, size_t size);
   void Parse(const std::string& data) {
     Parse(data.data(), data.size());
   }
 
+  // Returns true if the last Parse() method call encountered any syntax error.
   bool has_error() const { return has_error_; }
-  const WebSocketExtension& extension() const { return extension_; }
+  // Returns the result of the last Parse() method call.
+  const std::vector<WebSocketExtension>& extensions() const {
+    return extensions_;
+  }
 
  private:
   void Consume(char c);
-  void ConsumeExtension(WebSocketExtension* extension);
+  void ConsumeExtension();

[yhirano, 2015/03/30 11:02:03]

Please keep the parameter. All Consume* methods store the output to given
objects.

[tyoshino (SeeGerritForStatus), 2015/03/31 06:17:44]

Done.

   void ConsumeExtensionParameter(WebSocketExtension::Parameter* parameter);
   void ConsumeToken(base::StringPiece* token);
   void ConsumeQuotedToken(std::string* token);
@@ -46,10 +49,12 @@ class NET_EXPORT_PRIVATE WebSocketExtensionParser {
   static bool IsControl(char c);
   static bool IsSeparator(char c);
 
+  // The current position in the input string.
   const char* current_;
+  // The pointer of the end of the input string.
   const char* end_;
   bool has_error_;
-  WebSocketExtension extension_;
+  std::vector<WebSocketExtension> extensions_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketExtensionParser);
 };