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

chrome/browser/ui/webui/options/autofill_options_handler.cc

Index: chrome/browser/ui/webui/options/autofill_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/autofill_options_handler.cc b/chrome/browser/ui/webui/options/autofill_options_handler.cc
index 93b235181c49e6eafd1ef38065e29c7cf70a91d8..0f869baf93ebfb3aa3216075097bb56253f64590 100644
--- a/chrome/browser/ui/webui/options/autofill_options_handler.cc
+++ b/chrome/browser/ui/webui/options/autofill_options_handler.cc
@@ -162,16 +162,16 @@ void SetCountryData(const PersonalDataManager& manager,
   }
   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.