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

base/json/json_reader_unittest.cc

Index: base/json/json_reader_unittest.cc
===================================================================
--- base/json/json_reader_unittest.cc	(revision 0)
+++ base/json/json_reader_unittest.cc	(working copy)
@@ -3,11 +3,13 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "base/json_reader.h"
+#include "base/json/json_reader.h"
 #include "base/scoped_ptr.h"
 #include "base/values.h"
 #include "build/build_config.h"
 
+namespace base {
+
 TEST(JSONReaderTest, Reading) {
   // some whitespace checking
   scoped_ptr<Value> root;
@@ -514,3 +516,5 @@
             error_message);
 
 }
+
+}  // namespace base
Property changes on: base/json/json_reader_unittest.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/json_reader_unittest.cc:r69-2775