Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

chrome/test/webdriver/webdriver_dispatch_unittest.cc

 // 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.
 
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/webdriver/commands/response.h"
@@ skipping 115 matching lines @@
 
   // We do not know whether the response status or value will be
   // encoded first, so we have to parse the response body to
   // verify it is correct.
   std::string actual_data(http_response.data(),
                           http_response.length());
 
   int error_code;
   std::string error_message;
   scoped_ptr<Value> parsed_response(base::JSONReader::ReadAndReturnError(
-      actual_data, false, &error_code, &error_message));
+      actual_data, base::JSON_PARSE_RFC, &error_code, &error_message));
 
   ASSERT_TRUE(parsed_response.get() != NULL) << error_message;
   ASSERT_TRUE(parsed_response->IsType(Value::TYPE_DICTIONARY))
       << "Response should be a dictionary: " << actual_data;
 
   DictionaryValue* dict = static_cast<DictionaryValue*>(parsed_response.get());
   EXPECT_EQ(2u, dict->size());
   EXPECT_TRUE(dict->HasKey("status"));
   EXPECT_TRUE(dict->HasKey("value"));
 
@@ skipping 70 matching lines @@
       &parameters,
       &response));
   EXPECT_EQ("GET", method);
   ASSERT_EQ(3u, path_segments.size());
   EXPECT_EQ("", path_segments[0]);
   EXPECT_EQ("bar", path_segments[1]);
   EXPECT_EQ("baz", path_segments[2]);
 }
 
 }  // namespace webdriver