Revert of Change base::Value::ListStorage to std::vector<base::Value>

components/ntp_snippets/remote/remote_suggestions_provider_impl.cc

 // Copyright 2015 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 "components/ntp_snippets/remote/remote_suggestions_provider_impl.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 1173 matching lines @@
   }
   return &content_it->second;
 }
 
 void RemoteSuggestionsProviderImpl::RestoreCategoriesFromPrefs() {
   // This must only be called at startup, before there are any categories.
   DCHECK(category_contents_.empty());
 
   const base::ListValue* list =
       pref_service_->GetList(prefs::kRemoteSuggestionCategories);
-  for (const base::Value& entry : *list) {
+  for (const std::unique_ptr<base::Value>& entry : *list) {
     const base::DictionaryValue* dict = nullptr;
-    if (!entry.GetAsDictionary(&dict)) {
-      DLOG(WARNING) << "Invalid category pref value: " << entry;
+    if (!entry->GetAsDictionary(&dict)) {
+      DLOG(WARNING) << "Invalid category pref value: " << *entry;
       continue;
     }
     int id = 0;
     if (!dict->GetInteger(kCategoryContentId, &id)) {
       DLOG(WARNING) << "Invalid category pref value, missing '"
-                    << kCategoryContentId << "': " << entry;
+                    << kCategoryContentId << "': " << *entry;
       continue;
     }
     base::string16 title;
     if (!dict->GetString(kCategoryContentTitle, &title)) {
       DLOG(WARNING) << "Invalid category pref value, missing '"
-                    << kCategoryContentTitle << "': " << entry;
+                    << kCategoryContentTitle << "': " << *entry;
       continue;
     }
     bool included_in_last_server_response = false;
     if (!dict->GetBoolean(kCategoryContentProvidedByServer,
                           &included_in_last_server_response)) {
       DLOG(WARNING) << "Invalid category pref value, missing '"
-                    << kCategoryContentProvidedByServer << "': " << entry;
+                    << kCategoryContentProvidedByServer << "': " << *entry;
       continue;
     }
     bool allow_fetching_more_results = false;
     // This wasn't always around, so it's okay if it's missing.
     dict->GetBoolean(kCategoryContentAllowFetchingMore,
                      &allow_fetching_more_results);
 
     Category category = Category::FromIDValue(id);
     // The ranker may not persist the order of remote categories.
     category_ranker_->AppendCategoryIfNecessary(category);
@@ skipping 50 matching lines @@
 RemoteSuggestionsProviderImpl::CategoryContent::CategoryContent(
     CategoryContent&&) = default;
 
 RemoteSuggestionsProviderImpl::CategoryContent::~CategoryContent() = default;
 
 RemoteSuggestionsProviderImpl::CategoryContent&
 RemoteSuggestionsProviderImpl::CategoryContent::operator=(CategoryContent&&) =
     default;
 
 }  // namespace ntp_snippets