Convert string16 -> base::string16 in components/

components/autofill/browser/wallet/instrument.cc

 // Copyright (c) 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.
 
 #include "components/autofill/browser/wallet/instrument.h"
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/autofill_country.h"
 #include "components/autofill/browser/autofill_profile.h"
 #include "components/autofill/browser/credit_card.h"
 #include "components/autofill/browser/validation.h"
 #include "components/autofill/browser/wallet/wallet_address.h"
 
 namespace autofill {
 namespace wallet {
@@ skipping 30 matching lines @@
     case Instrument::JCB:
       return "JCB";
   }
   NOTREACHED();
   return "NOT_POSSIBLE";
 }
 
 }  // namespace
 
 Instrument::Instrument(const CreditCard& card,
-                       const string16& card_verification_number,
+                       const base::string16& card_verification_number,
                        const AutofillProfile& profile)
     : primary_account_number_(card.GetRawInfo(CREDIT_CARD_NUMBER)),
       card_verification_number_(card_verification_number),
       expiration_month_(card.expiration_month()),
       expiration_year_(card.expiration_year()),
       form_of_payment_(FormOfPaymentFromCardType(card.type())),
       address_(new Address(profile)) {
   Init();
 }
 
-Instrument::Instrument(const string16& primary_account_number,
-                       const string16& card_verification_number,
+Instrument::Instrument(const base::string16& primary_account_number,
+                       const base::string16& card_verification_number,
                        int expiration_month,
                        int expiration_year,
                        FormOfPayment form_of_payment,
                        scoped_ptr<Address> address)
     : primary_account_number_(primary_account_number),
       card_verification_number_(card_verification_number),
       expiration_month_(expiration_month),
       expiration_year_(expiration_year),
       form_of_payment_(form_of_payment),
       address_(address.Pass()) {
@@ skipping 49 matching lines @@
 
 void Instrument::Init() {
   if (primary_account_number_.size() >= 4) {
     last_four_digits_ =
         primary_account_number_.substr(primary_account_number_.size() - 4);
   }
 }
 
 }  // namespace wallet
 }  // namespace autofill