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

chrome/browser/ui/webui/options2/autofill_options_handler.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/ui/webui/options2/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 141 matching lines @@
     ListValue* name = new ListValue;  // owned by |list|
     name->Set(0, Value::CreateStringValue(first_names[i]));
     name->Set(1, Value::CreateStringValue(middle_names[i]));
     name->Set(2, Value::CreateStringValue(last_names[i]));
     (*names)->Set(i, name);
   }
 }
 
 // Set the multi-valued element for |type| from input |list| values.
 void SetNameList(const ListValue* names,
                  AutofillProfile* profile) {

[dhollowa, 2012/08/01 16:11:56]

nit: this line can be unwrapped.

[vabr (Chromium), 2012/08/03 07:08:23]

Done.

   const size_t size = names->GetSize();
   std::vector<string16> first_names(size);
   std::vector<string16> middle_names(size);
   std::vector<string16> last_names(size);
 
   for (size_t i = 0; i < size; ++i) {
-    ListValue* name;
+    const ListValue* name;
     bool success = names->GetList(i, &name);
     DCHECK(success);
 
     string16 first_name;
     success = name->GetString(0, &first_name);
     DCHECK(success);
     first_names[i] = first_name;
 
     string16 middle_name;
     success = name->GetString(1, &middle_name);
     DCHECK(success);
     middle_names[i] = middle_name;
 
     string16 last_name;
     success = name->GetString(2, &last_name);
     DCHECK(success);
     last_names[i] = last_name;
   }
 
   profile->SetMultiInfo(NAME_FIRST, first_names);
   profile->SetMultiInfo(NAME_MIDDLE, middle_names);
   profile->SetMultiInfo(NAME_LAST, last_names);
 }
 
 // Pulls the phone number |index|, |phone_number_list|, and |country_code| from
 // the |args| input.
 void ExtractPhoneNumberInformation(const ListValue* args,
                                    size_t* index,
-                                   ListValue** phone_number_list,
+                                   const ListValue** phone_number_list,
                                    std::string* country_code) {
   // Retrieve index as a |double|, as that is how it comes across from
   // JavaScript.
   double number = 0.0;
   if (!args->GetDouble(0, &number)) {
     NOTREACHED();
     return;
   }
   *index = number;
 
@@ skipping 33 matching lines @@
     }
     is_duplicate = autofill_i18n::PhoneNumbersMatch(new_value,
                                                     existing_value,
                                                     country_code);
   }
 
   if (is_duplicate)
     list->Remove(index, NULL);
 }
 
-void ValidatePhoneArguments(const ListValue* args, ListValue** list) {
+scoped_ptr<ListValue> ValidatePhoneArguments(const ListValue* args) {
   size_t index = 0;
   std::string country_code;
-  ExtractPhoneNumberInformation(args, &index, list, &country_code);
+  const ListValue* extracted_list = NULL;
+  ExtractPhoneNumberInformation(args, &index, &extracted_list, &country_code);
 
-  RemoveDuplicatePhoneNumberAtIndex(index, country_code, *list);
+  ListValue* list = extracted_list->DeepCopy();

[dhollowa, 2012/08/01 16:11:56]

optional: I have a slight preference for creating the scoped_ptr here (RAII) and
then using |Pass()| when returning it.

[vabr (Chromium), 2012/08/03 07:08:24]

Done.

+  RemoveDuplicatePhoneNumberAtIndex(index, country_code, list);
+  return scoped_ptr<ListValue>(list);
 }
 
 }  // namespace
 
 namespace options2 {
 
 AutofillOptionsHandler::AutofillOptionsHandler()
     : personal_data_(NULL) {
 }
 
@@ skipping 275 matching lines @@
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   AutofillProfile profile(guid);
 
   std::string country_code;
   string16 value;
-  ListValue* list_value;
+  const ListValue* list_value;
   if (args->GetList(1, &list_value))
     SetNameList(list_value, &profile);
   if (args->GetString(2, &value))
     profile.SetInfo(COMPANY_NAME, value);
   if (args->GetString(3, &value))
     profile.SetInfo(ADDRESS_HOME_LINE1, value);
   if (args->GetString(4, &value))
     profile.SetInfo(ADDRESS_HOME_LINE2, value);
   if (args->GetString(5, &value))
     profile.SetInfo(ADDRESS_HOME_CITY, value);
@@ skipping 43 matching lines @@
     personal_data_->AddCreditCard(credit_card);
   } else {
     personal_data_->UpdateCreditCard(credit_card);
   }
 }
 
 void AutofillOptionsHandler::ValidatePhoneNumbers(const ListValue* args) {
   if (!IsPersonalDataLoaded())
     return;
 
-  ListValue* list_value = NULL;
-  ValidatePhoneArguments(args, &list_value);
+  scoped_ptr<ListValue> list_value = ValidatePhoneArguments(args);
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options2