Move UTF16ToASCII, remove WideToASCII.

chrome/browser/ui/autofill/data_model_wrapper.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_i18n_input.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "components/autofill/content/browser/wallet/full_wallet.h"
 #include "components/autofill/content/browser/wallet/wallet_address.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/core/browser/autofill_data_model.h"
 #include "components/autofill/core/browser/autofill_field.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/autofill_type.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/form_structure.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_data.h"
 #include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 
-using base::ASCIIToUTF16;
-using base::UTF16ToUTF8;
-
 DataModelWrapper::~DataModelWrapper() {}
 
 void DataModelWrapper::FillInputs(DetailInputs* inputs) {
   for (size_t i = 0; i < inputs->size(); ++i) {
     (*inputs)[i].initial_value = GetInfo(AutofillType((*inputs)[i].type));
   }
 }
 
 base::string16 DataModelWrapper::GetInfoForDisplay(const AutofillType& type)
     const {
@@ skipping 17 matching lines @@
   i18ninput::CreateAddressData(
       base::Bind(&DataModelWrapper::GetInfo, base::Unretained(this)),
       &address_data);
   std::vector<std::string> lines;
   address_data.FormatForDisplay(&lines);
 
   // Email and phone number aren't part of address formatting.
   base::string16 non_address_info;
   base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
   if (!email.empty())
-    non_address_info += ASCIIToUTF16("\n") + email;
+    non_address_info += base::ASCIIToUTF16("\n") + email;
 
-  non_address_info += ASCIIToUTF16("\n") + phone;
+  non_address_info += base::ASCIIToUTF16("\n") + phone;
 
   // The separator is locale-specific.
   std::string compact_separator =
       ::i18n::addressinput::GetCompactAddressLinesSeparator(
           g_browser_process->GetApplicationLocale());
   *vertically_compact =
       base::UTF8ToUTF16(JoinString(lines, compact_separator)) +
           non_address_info;
   *horizontally_compact = base::UTF8ToUTF16(JoinString(lines, "\n")) +
       non_address_info;
@@ skipping 47 matching lines @@
 base::string16 AutofillProfileWrapper::GetInfoForDisplay(
     const AutofillType& type) const {
   // We display the "raw" phone number which contains user-defined formatting.
   if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER) {
     std::vector<base::string16> values;
     profile_->GetRawMultiInfo(type.GetStorableType(), &values);
     const base::string16& phone_number = values[GetVariantForType(type)];
 
     // If there is no user-defined formatting at all, add some standard
     // formatting.
-    if (base::ContainsOnlyChars(phone_number, ASCIIToUTF16("0123456789"))) {
-      std::string region = UTF16ToASCII(
+    if (base::ContainsOnlyChars(phone_number,
+                                base::ASCIIToUTF16("0123456789"))) {
+      std::string region = base::UTF16ToASCII(
           GetInfo(AutofillType(HTML_TYPE_COUNTRY_CODE, HTML_MODE_NONE)));
       i18n::PhoneObject phone(phone_number, region);
       return phone.GetFormattedNumber();
     }
 
     return phone_number;
   }
 
   return DataModelWrapper::GetInfoForDisplay(type);
 }
@@ skipping 130 matching lines @@
     return false;
   }
 
   if (!DataModelWrapper::GetDisplayText(vertically_compact,
                                         horizontally_compact)) {
     return false;
   }
 
   // TODO(estade): descriptive_name() is user-provided. Should we use it or
   // just type + last 4 digits?
-  base::string16 line1 = instrument_->descriptive_name() + ASCIIToUTF16("\n");
+  base::string16 line1 =
+      instrument_->descriptive_name() + base::ASCIIToUTF16("\n");
   *vertically_compact = line1 + *vertically_compact;
   *horizontally_compact = line1 + *horizontally_compact;
   return true;
 }
 
 // FullWalletBillingWrapper
 
 FullWalletBillingWrapper::FullWalletBillingWrapper(
     wallet::FullWallet* full_wallet)
     : full_wallet_(full_wallet) {
@@ skipping 31 matching lines @@
 
 FullWalletShippingWrapper::~FullWalletShippingWrapper() {}
 
 base::string16 FullWalletShippingWrapper::GetInfo(
     const AutofillType& type) const {
   return full_wallet_->shipping_address()->GetInfo(
       type, g_browser_process->GetApplicationLocale());
 }
 
 }  // namespace autofill