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

chrome/browser/history/starred_url_database.cc

Index: chrome/browser/history/starred_url_database.cc
===================================================================
--- chrome/browser/history/starred_url_database.cc	(revision 29830)
+++ chrome/browser/history/starred_url_database.cc	(working copy)
@@ -8,7 +8,7 @@
 #include "app/sql/statement.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/json_writer.h"
+#include "base/json/json_writer.h"
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ -620,7 +620,7 @@
   scoped_ptr<Value> encoded_bookmarks(
       encoder.Encode(&bookmark_bar_node, &other_node));
   std::string content;
-  JSONWriter::Write(encoded_bookmarks.get(), true, &content);
+  base::JSONWriter::Write(encoded_bookmarks.get(), true, &content);
 
   return (file_util::WriteFile(path, content.c_str(),
                                static_cast<int>(content.length())) != -1);