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

chrome/browser/media_galleries/media_galleries_preferences.cc

 // Copyright (c) 2012 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/media_galleries/media_galleries_preferences.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 603 matching lines @@
     return false;
 
   PrefService* prefs = profile_->GetPrefs();
   std::unique_ptr<ListPrefUpdate> update(
       new ListPrefUpdate(prefs, prefs::kMediaGalleriesRememberedGalleries));
   base::ListValue* list = update->Get();
   for (base::ListValue::iterator iter = list->begin();
        iter != list->end(); ++iter) {
     // All of these calls should succeed, but preferences file can be corrupt.
     base::DictionaryValue* dict;
-    if (!iter->GetAsDictionary(&dict))
+    if (!(*iter)->GetAsDictionary(&dict))
       continue;
     std::string this_device_id;
     if (!dict->GetString(kMediaGalleriesDeviceIdKey, &this_device_id))
       continue;
     if (this_device_id == device_id)
       return true;  // No update is necessary.
     StorageInfo::Type device_type;
     if (!StorageInfo::CrackDeviceId(this_device_id, &device_type, NULL))
       continue;
 
@@ skipping 71 matching lines @@
   known_galleries_.clear();
   device_map_.clear();
 
   PrefService* prefs = profile_->GetPrefs();
   const base::ListValue* list = prefs->GetList(
       prefs::kMediaGalleriesRememberedGalleries);
   if (list) {
     for (base::ListValue::const_iterator it = list->begin();
          it != list->end(); ++it) {
       const base::DictionaryValue* dict = NULL;
-      if (!it->GetAsDictionary(&dict))
+      if (!(*it)->GetAsDictionary(&dict))
         continue;
 
       MediaGalleryPrefInfo gallery_info;
       if (!PopulateGalleryPrefInfoFromDictionary(*dict, &gallery_info))
         continue;
 
       known_galleries_[gallery_info.pref_id] = gallery_info;
       device_map_[gallery_info.device_id].insert(gallery_info.pref_id);
     }
   }
@@ skipping 223 matching lines @@
     if (!update_gallery_name && !update_gallery_type &&
         !update_gallery_metadata && !update_scan_counts &&
         !update_default_gallery_type)
       return *pref_id_it;
 
     PrefService* prefs = profile_->GetPrefs();
     std::unique_ptr<ListPrefUpdate> update(
         new ListPrefUpdate(prefs, prefs::kMediaGalleriesRememberedGalleries));
     base::ListValue* list = update->Get();
 
-    for (base::ListValue::iterator list_iter = list->begin();
-         list_iter != list->end(); ++list_iter) {
+    for (base::ListValue::const_iterator list_iter = list->begin();
+         list_iter != list->end();
+         ++list_iter) {
       base::DictionaryValue* dict;
       MediaGalleryPrefId iter_id;
-      if (list_iter->GetAsDictionary(&dict) && GetPrefId(*dict, &iter_id) &&
+      if ((*list_iter)->GetAsDictionary(&dict) &&
+          GetPrefId(*dict, &iter_id) &&
           *pref_id_it == iter_id) {
         if (update_gallery_type)
           dict->SetString(kMediaGalleriesTypeKey, TypeToStringValue(new_type));
         if (update_gallery_name)
           dict->SetString(kMediaGalleriesDisplayNameKey, display_name);
         if (update_gallery_metadata) {
           dict->SetString(kMediaGalleriesVolumeLabelKey, volume_label);
           dict->SetString(kMediaGalleriesVendorNameKey, vendor_name);
           dict->SetString(kMediaGalleriesModelNameKey, model_name);
           dict->SetDouble(kMediaGalleriesSizeKey, total_size_in_bytes);
@@ skipping 74 matching lines @@
   base::ListValue* list = update->Get();
 
   std::vector<MediaGalleryPrefId> pref_ids;
 
   for (base::ListValue::iterator iter = list->begin();
        iter != list->end();
        ++iter) {
     base::DictionaryValue* dict;
     MediaGalleryPrefId pref_id;
 
-    if (!(iter->GetAsDictionary(&dict) && GetPrefId(*dict, &pref_id)))
+    if (!((*iter)->GetAsDictionary(&dict) && GetPrefId(*dict, &pref_id)))
       continue;
 
     std::string default_gallery_type_string;
 
     // If the "default gallery type" key is set, just update the paths in place.
     // If it's not set, then AddOrUpdateGalleryInternal will take care of
     // setting it as part of migration to prefs version 3.
     if (dict->GetString(kMediaGalleriesDefaultGalleryTypeKey,
                         &default_gallery_type_string)) {
       std::string device_id;
@@ skipping 76 matching lines @@
       new ListPrefUpdate(prefs, prefs::kMediaGalleriesRememberedGalleries));
   base::ListValue* list = update->Get();
 
   if (!base::ContainsKey(known_galleries_, id))
     return;
 
   for (base::ListValue::iterator iter = list->begin();
        iter != list->end(); ++iter) {
     base::DictionaryValue* dict;
     MediaGalleryPrefId iter_id;
-    if (iter->GetAsDictionary(&dict) && GetPrefId(*dict, &iter_id) &&
+    if ((*iter)->GetAsDictionary(&dict) && GetPrefId(*dict, &iter_id) &&
         id == iter_id) {
       RemoveGalleryPermissionsFromPrefs(id);
       MediaGalleryPrefInfo::Type type;
       if (!erase && GetType(*dict, &type) &&
           (type == MediaGalleryPrefInfo::kAutoDetected ||
            type == MediaGalleryPrefInfo::kScanResult)) {
         if (type == MediaGalleryPrefInfo::kAutoDetected) {
           dict->SetString(kMediaGalleriesTypeKey,
                           kMediaGalleriesTypeBlackListedValue);
         } else {
@@ skipping 157 matching lines @@
                                           extension_id,
                                           kMediaGalleriesPermissions);
   base::ListValue* permissions = update.Get();
   if (!permissions) {
     permissions = update.Create();
   } else {
     // If the gallery is already in the list, update the permission...
     for (base::ListValue::iterator iter = permissions->begin();
          iter != permissions->end(); ++iter) {
       base::DictionaryValue* dict = NULL;
-      if (!iter->GetAsDictionary(&dict))
+      if (!(*iter)->GetAsDictionary(&dict))
         continue;
       MediaGalleryPermission perm;
       if (!GetMediaGalleryPermissionFromDictionary(dict, &perm))
         continue;
       if (perm.pref_id == gallery_id) {
         if (has_access != perm.has_permission) {
           dict->SetBoolean(kMediaGalleryHasPermissionKey, has_access);
           return true;
         } else {
           return false;
@@ skipping 16 matching lines @@
   ExtensionPrefs::ScopedListUpdate update(GetExtensionPrefs(),
                                           extension_id,
                                           kMediaGalleriesPermissions);
   base::ListValue* permissions = update.Get();
   if (!permissions)
     return false;
 
   for (base::ListValue::iterator iter = permissions->begin();
        iter != permissions->end(); ++iter) {
     const base::DictionaryValue* dict = NULL;
-    if (!iter->GetAsDictionary(&dict))
+    if (!(*iter)->GetAsDictionary(&dict))
       continue;
     MediaGalleryPermission perm;
     if (!GetMediaGalleryPermissionFromDictionary(dict, &perm))
       continue;
     if (perm.pref_id == gallery_id) {
       permissions->Erase(iter, NULL);
       return true;
     }
   }
   return false;
 }
 
 std::vector<MediaGalleryPermission>
 MediaGalleriesPreferences::GetGalleryPermissionsFromPrefs(
     const std::string& extension_id) const {
   DCHECK(IsInitialized());
   std::vector<MediaGalleryPermission> result;
   const base::ListValue* permissions;
   if (!GetExtensionPrefs()->ReadPrefAsList(extension_id,
                                            kMediaGalleriesPermissions,
                                            &permissions)) {
     return result;
   }
 
   for (base::ListValue::const_iterator iter = permissions->begin();
        iter != permissions->end(); ++iter) {
-    const base::DictionaryValue* dict = NULL;
-    if (!iter->GetAsDictionary(&dict))
+    base::DictionaryValue* dict = NULL;
+    if (!(*iter)->GetAsDictionary(&dict))
       continue;
     MediaGalleryPermission perm;
     if (!GetMediaGalleryPermissionFromDictionary(dict, &perm))
       continue;
     result.push_back(perm);
   }
 
   return result;
 }
 
@@ skipping 21 matching lines @@
   if (extension_prefs_for_testing_)
     return extension_prefs_for_testing_;
   return extensions::ExtensionPrefs::Get(profile_);
 }
 
 void MediaGalleriesPreferences::SetExtensionPrefsForTesting(
     extensions::ExtensionPrefs* extension_prefs) {
   DCHECK(IsInitialized());
   extension_prefs_for_testing_ = extension_prefs;
 }