Cleanup return values in autofill

components/autofill/core/browser/autofill_country.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 43 matching lines @@
   // Returns the likely country code for |locale|, or "US" as a fallback if no
   // mapping from the locale is available.
   static const std::string CountryCodeForLocale(const std::string& locale);
 
   // Returns the country code corresponding to |country|, which should be a
   // country code or country name localized to |locale|.  This function can
   // be expensive so use judiciously.
   static const std::string GetCountryCode(const base::string16& country,
                                           const std::string& locale);
 
-  const std::string country_code() const { return country_code_; }
-  const base::string16 name() const { return name_; }
-  const base::string16 postal_code_label() const { return postal_code_label_; }
-  const base::string16 state_label() const { return state_label_; }
+  const std::string& country_code() const { return country_code_; }
+  const base::string16& name() const { return name_; }
+  const base::string16& postal_code_label() const { return postal_code_label_; }
+  const base::string16& state_label() const { return state_label_; }
 
   // City is expected in a complete address for this country.
   bool requires_city() const {
     return (address_required_fields_ & ADDRESS_REQUIRES_CITY) != 0;
   }
 
   // State is expected in a complete address for this country.
   bool requires_state() const {
     return (address_required_fields_ & ADDRESS_REQUIRES_STATE) != 0;
   }
@@ skipping 23 matching lines @@
 
   // Address requirement field codes for the country.
   AddressRequiredFields address_required_fields_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillCountry);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_COUNTRY_H_