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

base/json/json_reader.cc

 // Copyright (c) 2009 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/json_reader.h"
+#include "base/json/json_reader.h"
 
 #include "base/float_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #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;
 
 namespace {
 
 inline int HexToInt(wchar_t c) {
   if ('0' <= c && c <= '9') {
     return c - '0';
   } else if ('A' <= c && c <= 'F') {
@@ skipping 605 matching lines @@
     if (*pos == '\n') {
       ++line_number;
       column_number = 1;
     } else {
       ++column_number;
     }
   }
 
   error_message_ = FormatErrorMessage(line_number, column_number, description);
 }
+
+}  // namespace base