summaryrefslogtreecommitdiffstats
path: root/chrome/browser/history/starred_url_database.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 20:00:20 +0000
commit93d49d70b89b22ec46d0b00b7950297f64865d56 (patch)
tree3243e0209c738df0c18c2ba615667f757fcaec94 /chrome/browser/history/starred_url_database.cc
parenta9f607e33a91604bc63bd8c846aefbda9bf0dfa9 (diff)
downloadchromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.zip
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.gz
chromium_src-93d49d70b89b22ec46d0b00b7950297f64865d56.tar.bz2
Move the json-related files into a separate json directory. This hopefully also
makes the naming of string_escape more clear (it's actually JSON-specific). Move the files into the base namespace. TEST=none BUG=none Review URL: http://codereview.chromium.org/316016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/history/starred_url_database.cc')
-rw-r--r--chrome/browser/history/starred_url_database.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index 31e659c..55aa0dd 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -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 @@ bool StarredURLDatabase::MigrateBookmarksToFileImpl(const FilePath& path) {
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);