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

chrome/browser/policy/managed_bookmarks_policy_handler.cc

 // Copyright 2014 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 "chrome/browser/policy/managed_bookmarks_policy_handler.h"
 
 #include <utility>
 
 #include "base/values.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
@@ skipping 33 matching lines @@
                    GetFolderName(*list));
   FilterBookmarks(list);
   prefs->SetValue(bookmarks::prefs::kManagedBookmarks, std::move(value));
 }
 
 std::string
 ManagedBookmarksPolicyHandler::GetFolderName(const base::ListValue& list) {
   // Iterate over the list, and try to find the FolderName.
   for (const auto& el : list) {
     const base::DictionaryValue* dict = NULL;
-    if (!el || !el->GetAsDictionary(&dict)) continue;
+    if (!el.GetAsDictionary(&dict))
+      continue;
 
     std::string name;
     if (dict->GetString(ManagedBookmarksTracker::kFolderName, &name)) {
       return name;
     }
   }
 
   // FolderName not present.
   return std::string();
 }
 
 void ManagedBookmarksPolicyHandler::FilterBookmarks(base::ListValue* list) {
   // Remove any non-conforming values found.
   base::ListValue::iterator it = list->begin();
   while (it != list->end()) {
     base::DictionaryValue* dict = NULL;
-    if (!*it || !(*it)->GetAsDictionary(&dict)) {
+    if (!it->GetAsDictionary(&dict)) {
       it = list->Erase(it, NULL);
       continue;
     }
 
     std::string name;
     std::string url;
     base::ListValue* children = NULL;
     // Every bookmark must have a name, and then either a URL of a list of
     // child bookmarks.
     if (!dict->GetString(ManagedBookmarksTracker::kName, &name) ||
@@ skipping 16 matching lines @@
         continue;
       }
       dict->SetString(ManagedBookmarksTracker::kUrl, gurl.spec());
     }
 
     ++it;
   }
 }
 
 }  // namespace policy