[WebSocketExtensionParser] Have Consume.* methods return bool instead of using has_error()

net/websockets/websocket_extension_parser_test.cc

 // Copyright 2013 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/websockets/websocket_extension_parser.h"
 
 #include <string>
 
 #include "net/websockets/websocket_extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 TEST(WebSocketExtensionParserTest, ParseEmpty) {
   WebSocketExtensionParser parser;
-  parser.Parse("", 0);
+  EXPECT_FALSE(parser.Parse("", 0));
 
-  EXPECT_TRUE(parser.has_error());
   EXPECT_EQ(0U, parser.extensions().size());
 }
 
 TEST(WebSocketExtensionParserTest, ParseSimple) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
 
-  parser.Parse("foo");
+  EXPECT_TRUE(parser.Parse("foo"));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 TEST(WebSocketExtensionParserTest, ParseMoreThanOnce) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
 
-  parser.Parse("foo");
-  ASSERT_FALSE(parser.has_error());
+  EXPECT_TRUE(parser.Parse("foo"));
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 
-  parser.Parse("");
-  EXPECT_TRUE(parser.has_error());
+  EXPECT_FALSE(parser.Parse(""));
   EXPECT_EQ(0U, parser.extensions().size());
 
-  parser.Parse("foo");
-  ASSERT_FALSE(parser.has_error());
+  EXPECT_TRUE(parser.Parse("foo"));
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 TEST(WebSocketExtensionParserTest, ParseOneExtensionWithOneParamWithoutValue) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
   expected.Add(WebSocketExtension::Parameter("bar"));
 
-  parser.Parse("\tfoo ; bar");
+  EXPECT_TRUE(parser.Parse("\tfoo ; bar"));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 TEST(WebSocketExtensionParserTest, ParseOneExtensionWithOneParamWithValue) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
   expected.Add(WebSocketExtension::Parameter("bar", "baz"));
 
-  parser.Parse("foo ; bar= baz\t");
+  EXPECT_TRUE(parser.Parse("foo ; bar= baz\t"));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 TEST(WebSocketExtensionParserTest, ParseOneExtensionWithParams) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
   expected.Add(WebSocketExtension::Parameter("bar", "baz"));
   expected.Add(WebSocketExtension::Parameter("hoge", "fuga"));
 
-  parser.Parse("foo ; bar= baz;\t \thoge\t\t=fuga");
+  EXPECT_TRUE(parser.Parse("foo ; bar= baz;\t \thoge\t\t=fuga"));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 TEST(WebSocketExtensionParserTest, ParseTwoExtensions) {
   WebSocketExtensionParser parser;
 
   WebSocketExtension expected0("foo");
   expected0.Add(WebSocketExtension::Parameter("alpha", "x"));
 
   WebSocketExtension expected1("bar");
   expected1.Add(WebSocketExtension::Parameter("beta", "y"));
 
-  parser.Parse(" foo ; alpha = x , bar ; beta = y ");
+  EXPECT_TRUE(parser.Parse(" foo ; alpha = x , bar ; beta = y "));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(2U, parser.extensions().size());
 
   EXPECT_TRUE(expected0.Equals(parser.extensions()[0]));
   EXPECT_TRUE(expected1.Equals(parser.extensions()[1]));
 }
 
 TEST(WebSocketExtensionParserTest, InvalidPatterns) {
   const char* const patterns[] = {
       ",",                    // just a comma
       " , ",                  // just a comma with surrounding spaces
       "foo,",                 // second extension is incomplete (empty)
       "foo , ",               // second extension is incomplete (space)
       "foo,;",                // second extension is incomplete (semicolon)
+      "foo;, bar",            // first extension is incomplete
       "fo\ao",                // control in extension name
       "fo\x01o",              // control in extension name
       "fo<o",                 // separator in extension name
       "foo/",                 // separator in extension name
       ";bar",                 // empty extension name
       "foo bar",              // missing ';'
       "foo;",                 // extension parameter without name and value
       "foo; b\ar",            // control in parameter name
       "foo; b\x7fr",          // control in parameter name
       "foo; b[r",             // separator in parameter name
@@ skipping 14 matching lines @@
       "foo; bar=\"baz",       // unterminated quoted string
       "foo; bar=\"baz \"",    // space in quoted string
       "foo; bar baz",         // mising '='
       "foo; bar - baz",  // '-' instead of '=' (note: "foo; bar-baz" is valid).
       "foo; bar=\r\nbaz",   // CRNL not followed by a space
       "foo; bar=\r\n baz",  // CRNL followed by a space
   };
 
   for (size_t i = 0; i < arraysize(patterns); ++i) {
     WebSocketExtensionParser parser;
-    parser.Parse(patterns[i]);
-    EXPECT_TRUE(parser.has_error());
+    EXPECT_FALSE(parser.Parse(patterns[i]));
     EXPECT_EQ(0U, parser.extensions().size());
   }
 }
 
 TEST(WebSocketExtensionParserTest, QuotedParameterValue) {
   WebSocketExtensionParser parser;
   WebSocketExtension expected("foo");
   expected.Add(WebSocketExtension::Parameter("bar", "baz"));
 
-  parser.Parse("foo; bar = \"ba\\z\" ");
+  EXPECT_TRUE(parser.Parse("foo; bar = \"ba\\z\" "));
 
-  ASSERT_FALSE(parser.has_error());
   ASSERT_EQ(1U, parser.extensions().size());
   EXPECT_TRUE(expected.Equals(parser.extensions()[0]));
 }
 
 }  // namespace
 
 }  // namespace net