Make ValueDeserializer::Deserialize return scoped_ptr

ui/app_list/search/dictionary_data_store.cc

 // Copyright 2013 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 "ui/app_list/search/dictionary_data_store.h"
 
 #include "base/callback.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/logging.h"
@@ skipping 49 matching lines @@
 void DictionaryDataStore::ScheduleWrite() {
   writer_->ScheduleWrite(this);
 }
 
 scoped_ptr<base::DictionaryValue> DictionaryDataStore::LoadOnBlockingPool() {
   DCHECK(worker_pool_->RunsTasksOnCurrentThread());
 
   int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;
   std::string error_message;
   JSONFileValueDeserializer deserializer(data_file_);
-  base::Value* value = deserializer.Deserialize(&error_code, &error_message);
-  base::DictionaryValue* dict_value = NULL;
-  if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR || !value ||
-      !value->GetAsDictionary(&dict_value) || !dict_value) {
+  scoped_ptr<base::DictionaryValue> dict_value = base::DictionaryValue::From(
+      deserializer.Deserialize(&error_code, &error_message));
+  if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR || !dict_value) {
     return nullptr;
   }
 
-  base::DictionaryValue* return_dict = dict_value->DeepCopy();
-  cached_dict_.reset(dict_value);
-  return make_scoped_ptr(return_dict);
+  scoped_ptr<base::DictionaryValue> return_dict =
+      make_scoped_ptr(dict_value.get()->DeepCopy());
+  cached_dict_ = dict_value.Pass();
+  return return_dict;
 }
 
 bool DictionaryDataStore::SerializeData(std::string* data) {
   JSONStringValueSerializer serializer(data);
   serializer.set_pretty_print(true);
   return serializer.Serialize(*cached_dict_.get());
 }
 
 }  // namespace app_list