| Index: base/json/json_reader.h
|
| diff --git a/base/json/json_reader.h b/base/json/json_reader.h
|
| index 77c4e744dac4676a1303c5f5c3e3cecd22a3081d..a6f068675463eea2b147355b1b714d2eb288f689 100644
|
| --- a/base/json/json_reader.h
|
| +++ b/base/json/json_reader.h
|
| @@ -146,14 +146,12 @@ class JSONReader {
|
| bool allow_trailing_comma);
|
|
|
| private:
|
| - static std::string FormatErrorMessage(int line, int column,
|
| - const std::string& description);
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(JSONReader);
|
| -
|
| FRIEND_TEST(JSONReaderTest, Reading);
|
| FRIEND_TEST(JSONReaderTest, ErrorMessages);
|
|
|
| + static std::string FormatErrorMessage(int line, int column,
|
| + const std::string& description);
|
| +
|
| // Recursively build Value. Returns NULL if we don't have a valid JSON
|
| // string. If |is_root| is true, we verify that the root element is either
|
| // an object or an array.
|
| @@ -213,6 +211,8 @@ class JSONReader {
|
| JsonParseError error_code_;
|
| int error_line_;
|
| int error_col_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(JSONReader);
|
| };
|
|
|
| } // namespace base
|
|
|