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

components/autofill/browser/address.h

Index: components/autofill/browser/address.h
===================================================================
--- components/autofill/browser/address.h	(revision 192389)
+++ components/autofill/browser/address.h	(working copy)
@@ -26,28 +26,25 @@
   virtual string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
   virtual void SetRawInfo(AutofillFieldType type,
                           const string16& value) OVERRIDE;
+  virtual string16 GetInfo(AutofillFieldType type,
+                           const std::string& app_locale) const OVERRIDE;
+  virtual bool SetInfo(AutofillFieldType type,
+                       const string16& value,
+                       const std::string& app_locale) OVERRIDE;
   virtual void GetMatchingTypes(const string16& text,
                                 const std::string& app_locale,
                                 FieldTypeSet* matching_types) const OVERRIDE;
 
-  const std::string& country_code() const { return country_code_; }
-  void set_country_code(const std::string& country_code) {
-    country_code_ = country_code;
-  }
-
  private:
   // FormGroup:
   virtual void GetSupportedTypes(FieldTypeSet* supported_types) const OVERRIDE;
 
-  // Returns the localized country name corresponding to |country_code_|.
-  string16 Country() const;
-
   // The address.
   string16 line1_;
   string16 line2_;
   string16 city_;
   string16 state_;
-  std::string country_code_;
+  string16 country_code_;
   string16 zip_code_;
 };