Make autofill's Address store country using the country code so that app locale isn't needed for th…

components/autofill/browser/autofill_profile.h

 // 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.
 
 #ifndef COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 #define COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_
 
 #include <stddef.h>
 
 #include <iosfwd>
@@ skipping 64 matching lines @@
   // profiles. Shows at least 2 fields that differentiate profile from other
   // profiles. See AdjustInferredLabels() further down for more description.
   const string16 Label() const;
 
   // This guid is the primary identifier for |AutofillProfile| objects.
   // TODO(estade): remove this and just use GetGUID(). |guid_| can probably
   // be moved to FormGroup.
   const std::string guid() const { return guid_; }
   void set_guid(const std::string& guid) { guid_ = guid; }
 
-  // Accessors for the stored address's country code.
-  const std::string CountryCode() const;
-  void SetCountryCode(const std::string& country_code);
-
   // Returns true if there are no values (field types) set.
   bool IsEmpty() const;
 
   // Comparison for Sync.  Returns 0 if the profile is the same as |this|,
   // or < 0, or > 0 if it is different.  The implied ordering can be used for
   // culling duplicates.  The ordering is based on collation order of the
   // textual contents of the fields.
   // GUIDs are not compared, only the values of the contents themselves.
   // Full profile comparision, comparison includes multi-valued fields.
   int Compare(const AutofillProfile& profile) const;
@@ skipping 103 matching lines @@
   std::vector<EmailInfo> email_;
   CompanyInfo company_;
   std::vector<PhoneNumber> home_number_;
   Address address_;
 };
 
 // So we can compare AutofillProfiles with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const AutofillProfile& profile);
 
 #endif  // COMPONENTS_AUTOFILL_BROWSER_AUTOFILL_PROFILE_H_