summaryrefslogtreecommitdiffstats
path: root/chrome/browser/bookmarks
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-26 20:26:42 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-26 20:26:42 +0000
commitffbec69cf826b6c5e88f2f29500c2f6f277130b9 (patch)
treec685d66f182def5178f16260180966ed22ec66c7 /chrome/browser/bookmarks
parent19b6d9226813241d98b86e6aa34ab50cc460d368 (diff)
downloadchromium_src-ffbec69cf826b6c5e88f2f29500c2f6f277130b9.zip
chromium_src-ffbec69cf826b6c5e88f2f29500c2f6f277130b9.tar.gz
chromium_src-ffbec69cf826b6c5e88f2f29500c2f6f277130b9.tar.bz2
Break two classes defined in json_value_serializer.cc, .h into separate files.
This will allow the use of JSONStringValueSerializer in the NaCl sandbox. BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9465030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r--chrome/browser/bookmarks/bookmark_codec_unittest.cc4
-rw-r--r--chrome/browser/bookmarks/bookmark_storage.cc5
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_codec_unittest.cc b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
index 9598250..dbc1681 100644
--- a/chrome/browser/bookmarks/bookmark_codec_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_codec_unittest.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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/file_path.h"
#include "base/file_util.h"
-#include "base/json/json_value_serializer.h"
+#include "base/json/json_file_value_serializer.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
#include "base/string_util.h"
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index 3de96ff..a520475 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -8,7 +8,8 @@
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/file_util_proxy.h"
-#include "base/json/json_value_serializer.h"
+#include "base/json/json_file_value_serializer.h"
+#include "base/json/json_string_value_serializer.h"
#include "base/metrics/histogram.h"
#include "base/time.h"
#include "chrome/browser/bookmarks/bookmark_codec.h"