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

base/json/json_reader.h

Index: base/json/json_reader.h
===================================================================
--- base/json/json_reader.h	(revision 0)
+++ base/json/json_reader.h	(working copy)
@@ -28,8 +28,8 @@
 // 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>
 
@@ -38,6 +38,8 @@
 
 class Value;
 
+namespace base {
+
 class JSONReader {
  public:
   // A struct to hold a JS token.
@@ -119,7 +121,7 @@
   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);
@@ -183,4 +185,6 @@
   std::string error_message_;
 };
 
-#endif  // BASE_JSON_READER_H_
+}  // namespace base
+
+#endif  // BASE_JSON_JSON_READER_H_
Property changes on: base/json/json_reader.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/json_reader.h:r69-2775