summaryrefslogtreecommitdiffstats
path: root/components/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'components/bookmarks')
-rw-r--r--components/bookmarks/browser/bookmark_codec.cc4
-rw-r--r--components/bookmarks/browser/bookmark_codec_unittest.cc8
-rw-r--r--components/bookmarks/browser/bookmark_storage.cc4
3 files changed, 8 insertions, 8 deletions
diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
index 0392c47..9ea5ae4 100644
--- a/components/bookmarks/browser/bookmark_codec.cc
+++ b/components/bookmarks/browser/bookmark_codec.cc
@@ -386,8 +386,8 @@ bool BookmarkCodec::DecodeMetaInfo(const base::DictionaryValue& value,
if (meta_info->IsType(base::Value::TYPE_STRING)) {
std::string meta_info_str;
meta_info->GetAsString(&meta_info_str);
- JSONStringValueSerializer serializer(meta_info_str);
- deserialized_holder.reset(serializer.Deserialize(nullptr, nullptr));
+ JSONStringValueDeserializer deserializer(meta_info_str);
+ deserialized_holder.reset(deserializer.Deserialize(nullptr, nullptr));
if (!deserialized_holder)
return false;
meta_info = deserialized_holder.get();
diff --git a/components/bookmarks/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc
index 9d529f8..8c45aea 100644
--- a/components/bookmarks/browser/bookmark_codec_unittest.cc
+++ b/components/bookmarks/browser/bookmark_codec_unittest.cc
@@ -359,8 +359,8 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) {
GetTestDataDir().AppendASCII("bookmarks/model_without_sync.json");
ASSERT_TRUE(base::PathExists(test_file));
- JSONFileValueSerializer serializer(test_file);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
+ JSONFileValueDeserializer deserializer(test_file);
+ scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel());
BookmarkCodec decoder;
@@ -445,8 +445,8 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) {
GetTestDataDir().AppendASCII("bookmarks/meta_info_as_string.json");
ASSERT_TRUE(base::PathExists(test_file));
- JSONFileValueSerializer serializer(test_file);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
+ JSONFileValueDeserializer deserializer(test_file);
+ scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
scoped_ptr<BookmarkModel> model(client_.CreateModel());
BookmarkCodec decoder;
diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
index b377069..daafdbe 100644
--- a/components/bookmarks/browser/bookmark_storage.cc
+++ b/components/bookmarks/browser/bookmark_storage.cc
@@ -56,8 +56,8 @@ void LoadCallback(const base::FilePath& path,
bool load_index = false;
bool bookmark_file_exists = base::PathExists(path);
if (bookmark_file_exists) {
- JSONFileValueSerializer serializer(path);
- scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
+ JSONFileValueDeserializer deserializer(path);
+ scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));
if (root.get()) {
// Building the index can take a while, so we do it on the background