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

base/json/json_reader.cc

Index: base/json/json_reader.cc
===================================================================
--- base/json/json_reader.cc	(revision 0)
+++ base/json/json_reader.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
@@ -11,6 +11,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 
+namespace base {
+
 static const JSONReader::Token kInvalidToken(JSONReader::Token::INVALID_TOKEN,
                                              0, 0);
 static const int kStackLimit = 100;
@@ -636,3 +638,5 @@
 
   error_message_ = FormatErrorMessage(line_number, column_number, description);
 }
+
+}  // namespace base
Property changes on: base/json/json_reader.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/json_reader.cc:r69-2775