Recognize "\r\n" line endings in base::JSONParser to report correct line numbers in errors

base/json/json_parser_unittest.cc

Index: base/json/json_parser_unittest.cc
===================================================================
--- base/json/json_parser_unittest.cc	(revision 177738)
+++ base/json/json_parser_unittest.cc	(working copy)
@@ -210,7 +210,7 @@
   EXPECT_EQ(0, error_code);
 
   // Test line and column counting
-  const char* big_json = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]";
+  const char big_json[] = "[\n0,\n1,\n2,\n3,4,5,6 7,\n8,\n9\n]";
   // error here ---------------------------------^

[Mark Mentovai, 2013/02/05 02:13:38]

You need to fix this now—it’s supposed to point to the 7.

   root.reset(JSONReader::ReadAndReturnError(big_json, JSON_PARSE_RFC,
                                             &error_code, &error_message));
@@ -219,6 +219,19 @@
             error_message);
   EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code);
 
+  error_code = 0;
+  error_message = "";
+  // Test line and column counting with "\r\n" line ending
+  const char big_json_crlf[] =
+      "[\r\n0,\r\n1,\r\n2,\r\n3,4,5,6 7,\r\n8,\r\n9\r\n]";
+  // error here --------------------^

[Mark Mentovai, 2013/02/05 02:13:38]

This too.

+  root.reset(JSONReader::ReadAndReturnError(big_json_crlf, JSON_PARSE_RFC,
+                                            &error_code, &error_message));
+  EXPECT_FALSE(root.get());
+  EXPECT_EQ(JSONParser::FormatErrorMessage(5, 10, JSONReader::kSyntaxError),
+            error_message);
+  EXPECT_EQ(JSONReader::JSON_SYNTAX_ERROR, error_code);
+
   // Test each of the error conditions
   root.reset(JSONReader::ReadAndReturnError("{},{}", JSON_PARSE_RFC,
                                             &error_code, &error_message));