autofill/options: address some nits I had on one of rouslan@'s CLs[1].

chrome/browser/ui/webui/options/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/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 144 matching lines @@
     scoped_ptr<base::DictionaryValue> option_details(
         new base::DictionaryValue());
     option_details->SetString("name", model.GetItemAt(i));
     option_details->SetString(
         "value",
         countries[i] ? countries[i]->country_code() : "separator");
     country_list->Append(option_details.release());
   }
   localized_strings->Set("autofillCountrySelectList", country_list.release());
 
-  scoped_ptr<base::ListValue> defaultCountryComponents(new base::ListValue);
-  std::string defaultCountryLanguageCode;
+  scoped_ptr<base::ListValue> default_country_components(new base::ListValue);
+  std::string default_country_language_code;
   GetAddressComponents(countries.front()->country_code(),
                        g_browser_process->GetApplicationLocale(),
-                       defaultCountryComponents.get(),
-                       &defaultCountryLanguageCode);
+                       default_country_components.get(),
+                       &default_country_language_code);
   localized_strings->Set("autofillDefaultCountryComponents",
-                         defaultCountryComponents.release());
+                         default_country_components.release());
   localized_strings->SetString("autofillDefaultCountryLanguageCode",
-                               defaultCountryLanguageCode);
+                               default_country_language_code);
 }
 
 // Get the multi-valued element for |type| and return it in |ListValue| form.
 void GetValueList(const AutofillProfile& profile,
                   ServerFieldType type,
                   scoped_ptr<base::ListValue>* list) {
   list->reset(new base::ListValue);
 
   std::vector<base::string16> values;
   profile.GetRawMultiInfo(type, &values);
@@ skipping 478 matching lines @@
 
   web_ui()->CallJavascriptFunction(
     "AutofillEditAddressOverlay.setValidatedPhoneNumbers", *list_value);
 }
 
 bool AutofillOptionsHandler::IsPersonalDataLoaded() const {
   return personal_data_ && personal_data_->IsDataLoaded();
 }
 
 }  // namespace options