Correct const accessors in base/values.(h|cc), Part II (ListValue)

chrome/browser/chromeos/gdata/gdata_contacts_service.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/chromeos/gdata/gdata_contacts_service.h"
 
 #include <cstring>
 #include <string>
 #include <map>
 #include <utility>
@@ skipping 162 matching lines @@
 }
 
 // Gets the photo URL from a contact's dictionary (within the "entry" list).
 // Returns an empty string if no photo was found.
 std::string GetPhotoUrl(const DictionaryValue& dict) {
   const ListValue* link_list = NULL;
   if (!dict.GetList(kLinkField, &link_list))
     return std::string();
 
   for (size_t i = 0; i < link_list->GetSize(); ++i) {
-    DictionaryValue* link_dict = NULL;
+    const DictionaryValue* link_dict = NULL;
     if (!link_list->GetDictionary(i, &link_dict))
       continue;
 
     std::string rel;
     if (!link_dict->GetString(kLinkRelField, &rel))
       continue;
     if (rel != kLinkRelPhotoValue)
       continue;
 
     // From https://goo.gl/7T6Od: "If a contact does not have a photo, then the
@@ skipping 36 matching lines @@
   dict.GetString(kFullNameField, contact->mutable_full_name());
   dict.GetString(kGivenNameField, contact->mutable_given_name());
   dict.GetString(kAdditionalNameField, contact->mutable_additional_name());
   dict.GetString(kFamilyNameField, contact->mutable_family_name());
   dict.GetString(kNamePrefixField, contact->mutable_name_prefix());
   dict.GetString(kNameSuffixField, contact->mutable_name_suffix());
 
   const ListValue* email_list = NULL;
   if (dict.GetList(kEmailField, &email_list)) {
     for (size_t i = 0; i < email_list->GetSize(); ++i) {
-      DictionaryValue* email_dict = NULL;
+      const DictionaryValue* email_dict = NULL;
       if (!email_list->GetDictionary(i, &email_dict))
         return false;
 
       contacts::Contact_EmailAddress* email = contact->add_email_addresses();
       if (!email_dict->GetString(kEmailAddressField, email->mutable_address()))
         return false;
       email->set_primary(IsAddressPrimary(*email_dict));
       InitAddressType(*email_dict, email->mutable_type());
     }
   }
 
   const ListValue* phone_list = NULL;
   if (dict.GetList(kPhoneField, &phone_list)) {
     for (size_t i = 0; i < phone_list->GetSize(); ++i) {
-      DictionaryValue* phone_dict = NULL;
+      const DictionaryValue* phone_dict = NULL;
       if (!phone_list->GetDictionary(i, &phone_dict))
         return false;
 
       contacts::Contact_PhoneNumber* phone = contact->add_phone_numbers();
       if (!phone_dict->GetString(kPhoneNumberField, phone->mutable_number()))
         return false;
       phone->set_primary(IsAddressPrimary(*phone_dict));
       InitAddressType(*phone_dict, phone->mutable_type());
     }
   }
 
   const ListValue* address_list = NULL;
   if (dict.GetList(kPostalAddressField, &address_list)) {
     for (size_t i = 0; i < address_list->GetSize(); ++i) {
-      DictionaryValue* address_dict = NULL;
+      const DictionaryValue* address_dict = NULL;
       if (!address_list->GetDictionary(i, &address_dict))
         return false;
 
       contacts::Contact_PostalAddress* address =
           contact->add_postal_addresses();
       if (!address_dict->GetString(kPostalAddressFormattedField,
                                    address->mutable_address())) {
         return false;
       }
       address->set_primary(IsAddressPrimary(*address_dict));
       InitAddressType(*address_dict, address->mutable_type());
     }
   }
 
   const ListValue* im_list = NULL;
   if (dict.GetList(kInstantMessagingField, &im_list)) {
     for (size_t i = 0; i < im_list->GetSize(); ++i) {
-      DictionaryValue* im_dict = NULL;
+      const DictionaryValue* im_dict = NULL;
       if (!im_list->GetDictionary(i, &im_dict))
         return false;
 
       contacts::Contact_InstantMessagingAddress* im =
           contact->add_instant_messaging_addresses();
       if (!im_dict->GetString(kInstantMessagingAddressField,
                               im->mutable_address())) {
         return false;
       }
       im->set_primary(IsAddressPrimary(*im_dict));
@@ skipping 98 matching lines @@
       LOG(WARNING) << "Feed dictionary missing";
       return false;
     }
 
     // Check the category field to confirm that this is actually a contact feed.
     const ListValue* category_list = NULL;
     if (!feed_dict->GetList(kCategoryField, &category_list)) {
       LOG(WARNING) << "Category list missing";
       return false;
     }
-    DictionaryValue* category_dict = NULL;
+    const DictionaryValue* category_dict = NULL;
     if (!category_list->GetSize() == 1 ||
         !category_list->GetDictionary(0, &category_dict)) {
       LOG(WARNING) << "Unable to get dictionary from category list of size "
                    << category_list->GetSize();
       return false;
     }
     std::string category_scheme, category_term;
     if (!category_dict->GetString(kCategorySchemeField, &category_scheme) ||
         !category_dict->GetString(kCategoryTermField, &category_term) ||
         category_scheme != kCategorySchemeValue ||
@@ skipping 186 matching lines @@
 
 void GDataContactsService::OnRequestComplete(DownloadContactsRequest* request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   VLOG(1) << "Download request " << request << " complete";
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts