Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

services/catalog/instance.cc

 // Copyright 2016 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 "services/catalog/instance.h"
 
 #include "base/bind.h"
 #include "services/catalog/entry.h"
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/reader.h"
@@ skipping 127 matching lines @@
 // Instance, private:
 
 void Instance::DeserializeCatalog() {
   DCHECK(system_cache_);
   if (!store_)
     return;
   const base::ListValue* catalog = store_->GetStore();
   CHECK(catalog);
   // TODO(sky): make this handle aliases.
   // TODO(beng): implement this properly!
-  for (auto it = catalog->begin(); it != catalog->end(); ++it) {
+  for (const auto& v : *catalog) {
     const base::DictionaryValue* dictionary = nullptr;
-    const base::Value* v = *it;
     CHECK(v->GetAsDictionary(&dictionary));
     std::unique_ptr<Entry> entry = Entry::Deserialize(*dictionary);
     // TODO(beng): user catalog.
     if (entry)
       (*system_cache_)[entry->name()] = std::move(entry);
   }
 }
 
 void Instance::SerializeCatalog() {
   DCHECK(system_cache_);
   std::unique_ptr<base::ListValue> catalog(new base::ListValue);
   // TODO(beng): user catalog.
   for (const auto& entry : *system_cache_)
     catalog->Append(entry.second->Serialize());
   if (store_)
     store_->UpdateStore(std::move(catalog));
 }
 
 // static
 void Instance::OnReadManifest(base::WeakPtr<Instance> instance,
                               const std::string& mojo_name,
                               const ResolveMojoNameCallback& callback,
                               shell::mojom::ResolveResultPtr result) {
   callback.Run(std::move(result));
   if (instance)
     instance->SerializeCatalog();
 }
 
 }  // namespace catalog