1 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/autofill/wallet/instrument.h b/chrome/browser/autofill/wallet/instrument.h
index 11f15d4..9c31b63 100644
--- a/chrome/browser/autofill/wallet/instrument.h
+++ b/chrome/browser/autofill/wallet/instrument.h
@@ -8,6 +8,7 @@
 #include <string>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/string16.h"
 
 namespace base {
 class DictionaryValue;
@@ -31,8 +32,8 @@ class Instrument {
     JCB,
   };
 
-  Instrument(const std::string& primary_account_number,
-             const std::string& card_verification_number,
+  Instrument(const string16& primary_account_number,
+             const string16& card_verification_number,
              int expiration_month,
              int expiration_year,
              FormOfPayment form_of_payment,
@@ -45,24 +46,24 @@ class Instrument {
   // in the constructor were valid for use with Google Wallet.
   bool IsValid() const;
 
-  const std::string& primary_account_number() const {
+  const string16& primary_account_number() const {
     return primary_account_number_;
   }
-  const std::string& card_verification_number() const {
+  const string16& card_verification_number() const {
     return card_verification_number_;
   }
   int expiration_month() const { return expiration_month_; }
   int expiration_year() const { return expiration_year_; }
   const Address& address() const { return *address_; }
   FormOfPayment form_of_payment() const { return form_of_payment_; }
-  const std::string& last_four_digits() { return last_four_digits_; }
+  const string16& last_four_digits() { return last_four_digits_; }
 
  private:
   // |primary_account_number_| is expected to be \d{12-19}.
-  std::string primary_account_number_;
+  string16 primary_account_number_;
 
   // |card_verification_number_| is expected to be \d{3-4}.
-  std::string card_verification_number_;
+  string16 card_verification_number_;
 
   // |expiration month_| should be 1-12.
   int expiration_month_;
@@ -77,7 +78,7 @@ class Instrument {
   scoped_ptr<Address> address_;
 
   // The last four digits of |primary_account_number_|.
-  std::string last_four_digits_;
+  string16 last_four_digits_;
 
   DISALLOW_COPY_AND_ASSIGN(Instrument);
 };