Index: chrome/browser/media_galleries/media_galleries_preferences.cc |
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc |
index 649e3102995d153e16aa5c2047156d6d4f3d6277..db859f57d8e6927312b692c68f52d49409115ccc 100644 |
--- a/chrome/browser/media_galleries/media_galleries_preferences.cc |
+++ b/chrome/browser/media_galleries/media_galleries_preferences.cc |
@@ -621,7 +621,7 @@ |
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)) |
@@ -713,7 +713,7 @@ |
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; |
@@ -957,11 +957,13 @@ |
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)); |
@@ -1056,7 +1058,7 @@ |
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; |
@@ -1153,7 +1155,7 @@ |
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; |
@@ -1331,7 +1333,7 @@ |
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)) |
@@ -1368,7 +1370,7 @@ |
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)) |
@@ -1395,8 +1397,8 @@ |
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)) |