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

chrome/browser/history/starred_url_database.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 "chrome/browser/history/starred_url_database.h"
 
 #include "app/sql/connection.h"
 #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"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/meta_table_helper.h"
 
@@ skipping 591 matching lines @@
     // visual order so that we know we maintain visual order by always adding
     // to the end.
     parent->Add(parent->GetChildCount(), node);
   }
 
   // Save to file.
   BookmarkCodec encoder;
   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);
 }
 
 }  // namespace history