Move the json-related files into a separate json directory. This hopefully al...

base/json/json_reader.h

 // Copyright (c) 2006-2008 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.
 //
 // A JSON parser.  Converts strings of JSON into a Value object (see
 // base/values.h).
 // http://www.ietf.org/rfc/rfc4627.txt?number=4627
 //
 // Known limitations/deviations from the RFC:
 // - Only knows how to parse ints within the range of a signed 32 bit int and
@@ skipping 10 matching lines @@
 //   character, the function skips a Unicode BOM at the beginning of the
 //   Unicode string (converted from the input UTF-8 string) before parsing it.
 //
 // TODO(tc): Add a parsing option to to relax object keys being wrapped in
 //   double quotes
 // TODO(tc): Add an option to disable comment stripping
 // TODO(aa): Consider making the constructor public and the static Read() method
 // only a convenience for the common uses with more complex configuration going
 // on the instance.
 
-#ifndef BASE_JSON_READER_H_
-#define BASE_JSON_READER_H_
+#ifndef BASE_JSON_JSON_READER_H_
+#define BASE_JSON_JSON_READER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 class Value;
 
+namespace base {
+
 class JSONReader {
  public:
   // A struct to hold a JS token.
   class Token {
    public:
     enum Type {
      OBJECT_BEGIN,           // {
      OBJECT_END,             // }
      ARRAY_BEGIN,            // [
      ARRAY_END,              // ]
@@ skipping 61 matching lines @@
   // array. Otherwise, it can be any valid JSON type.
   // If |allow_trailing_comma| is true, we will ignore trailing commas in
   // objects and arrays even though this goes against the RFC.
   Value* JsonToValue(const std::string& json, bool check_root,
                      bool allow_trailing_comma);
 
  private:
   static std::string FormatErrorMessage(int line, int column,
                                         const char* description);
 
-  DISALLOW_EVIL_CONSTRUCTORS(JSONReader);
+  DISALLOW_COPY_AND_ASSIGN(JSONReader);
 
   FRIEND_TEST(JSONReaderTest, Reading);
   FRIEND_TEST(JSONReaderTest, ErrorMessages);
 
   // 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.
   Value* BuildValue(bool is_root);
 
   // Parses a sequence of characters into a Token::NUMBER. If the sequence of
@@ skipping 43 matching lines @@
   // Used to keep track of how many nested lists/dicts there are.
   int stack_depth_;
 
   // A parser flag that allows trailing commas in objects and arrays.
   bool allow_trailing_comma_;
 
   // Contains the error message for the last call to JsonToValue(), if any.
   std::string error_message_;
 };
 
-#endif  // BASE_JSON_READER_H_
+}  // namespace base
+
+#endif  // BASE_JSON_JSON_READER_H_