rAc: update android test

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/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_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_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 "components/autofill/core/browser/validation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace autofill {
 
 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 {
+  return GetInfo(type);
+}
+
 gfx::Image DataModelWrapper::GetIcon() {
   return gfx::Image();
 }
 
 bool DataModelWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   base::string16 comma = ASCIIToUTF16(", ");
   base::string16 newline = ASCIIToUTF16("\n");
 
@@ skipping 21 matching lines @@
 }
 
 DataModelWrapper::DataModelWrapper() {}
 
 void DataModelWrapper::FillFormField(AutofillField* field) const {
   field->value = GetInfo(field->Type());
 }
 
 base::string16 DataModelWrapper::GetAddressDisplayText(
     const base::string16& separator) {
-  base::string16 address = GetInfo(AutofillType(NAME_FULL)) + separator +
-      GetInfo(AutofillType(ADDRESS_HOME_LINE1));
-  base::string16 address2 = GetInfo(AutofillType(ADDRESS_HOME_LINE2));
+  base::string16 address = GetInfoForDisplay(AutofillType(NAME_FULL)) +
+      separator + GetInfoForDisplay(AutofillType(ADDRESS_HOME_LINE1));
+  base::string16 address2 = GetInfoForDisplay(AutofillType(ADDRESS_HOME_LINE2));
   if (!address2.empty())
     address += separator + address2;
 
   base::string16 comma = ASCIIToUTF16(", ");
   base::string16 newline = ASCIIToUTF16("\n");
   address += separator +
-      GetInfo(AutofillType(ADDRESS_HOME_CITY)) + comma +
-      GetInfo(AutofillType(ADDRESS_HOME_STATE)) + ASCIIToUTF16(" ") +
-      GetInfo(AutofillType(ADDRESS_HOME_ZIP));
+      GetInfoForDisplay(AutofillType(ADDRESS_HOME_CITY)) + comma +
+      GetInfoForDisplay(AutofillType(ADDRESS_HOME_STATE)) + ASCIIToUTF16(" ") +
+      GetInfoForDisplay(AutofillType(ADDRESS_HOME_ZIP));
 
-  base::string16 email = GetInfo(AutofillType(EMAIL_ADDRESS));
+  base::string16 email = GetInfoForDisplay(AutofillType(EMAIL_ADDRESS));
   if (!email.empty())
     address += newline + email;
-  address += newline + GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER));
+  address += newline + GetInfoForDisplay(AutofillType(PHONE_HOME_WHOLE_NUMBER));
 
   return address;
 }
 
 // EmptyDataModelWrapper
 
 EmptyDataModelWrapper::EmptyDataModelWrapper() {}
 EmptyDataModelWrapper::~EmptyDataModelWrapper() {}
 
 base::string16 EmptyDataModelWrapper::GetInfo(const AutofillType& type) const {
@@ skipping 20 matching lines @@
 AutofillProfileWrapper::~AutofillProfileWrapper() {}
 
 base::string16 AutofillProfileWrapper::GetInfo(const AutofillType& type)
     const {
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   std::vector<base::string16> values;
   profile_->GetMultiInfo(type, app_locale, &values);
   return values[GetVariantForType(type)];
 }
 
+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 (ContainsOnlyChars(phone_number, ASCIIToUTF16("0123456789"))) {
+      std::string region = 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);
+}
+
 void AutofillProfileWrapper::FillFormField(AutofillField* field) const {
   if (field->Type().GetStorableType() == CREDIT_CARD_NAME) {
     // Cache the field's true type.
     HtmlFieldType original_type = field->html_type();
 
     // Requests for the user's credit card are filled from the billing address,
     // but the AutofillProfile class doesn't know how to fill credit card
     // fields. So, temporarily set the type to the corresponding profile type.
     field->SetHtmlType(HTML_TYPE_NAME, field->html_mode());
 
@@ skipping 81 matching lines @@
 WalletAddressWrapper::~WalletAddressWrapper() {}
 
 base::string16 WalletAddressWrapper::GetInfo(const AutofillType& type) const {
   // Reachable from DataModelWrapper::GetDisplayText().
   if (type.GetStorableType() == EMAIL_ADDRESS)
     return base::string16();
 
   return address_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
+base::string16 WalletAddressWrapper::GetInfoForDisplay(const AutofillType& type)
+    const {
+  if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER)
+    return address_->DisplayPhoneNumber();
+
+  return DataModelWrapper::GetInfoForDisplay(type);
+  return GetInfo(type);

[aruslan, 2013/10/01 01:51:17]

unreachable GetInfo.

[Evan Stade, 2013/10/01 02:00:36]

Done.

+}
+
 bool WalletAddressWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   if (!address_->is_complete_address() ||
       GetInfo(AutofillType(PHONE_HOME_WHOLE_NUMBER)).empty()) {
     return false;
   }
 
   return DataModelWrapper::GetDisplayText(vertically_compact,
                                           horizontally_compact);
@@ skipping 12 matching lines @@
   // Reachable from DataModelWrapper::GetDisplayText().
   if (type.GetStorableType() == EMAIL_ADDRESS)
     return base::string16();
 
   if (type.GetStorableType() == CREDIT_CARD_EXP_MONTH)
     return MonthComboboxModel::FormatMonth(instrument_->expiration_month());
 
   return instrument_->GetInfo(type, g_browser_process->GetApplicationLocale());
 }
 
+base::string16 WalletInstrumentWrapper::GetInfoForDisplay(
+    const AutofillType& type) const {
+  if (type.GetStorableType() == PHONE_HOME_WHOLE_NUMBER)
+    return instrument_->address().DisplayPhoneNumber();
+
+  return DataModelWrapper::GetInfoForDisplay(type);
+}
+
 gfx::Image WalletInstrumentWrapper::GetIcon() {
   return instrument_->CardIcon();
 }
 
 bool WalletInstrumentWrapper::GetDisplayText(
     base::string16* vertically_compact,
     base::string16* horizontally_compact) {
   // TODO(dbeam): handle other instrument statuses? http://crbug.com/233048
   if (instrument_->status() == wallet::WalletItems::MaskedInstrument::EXPIRED ||
       !instrument_->address().is_complete_address() ||
@@ skipping 68 matching lines @@
   ServerFieldType storable_type = type.GetStorableType();
   for (DetailOutputMap::const_iterator it = outputs_.begin();
        it != outputs_.end(); ++it) {
     if (storable_type == AutofillType(it->first->type).GetStorableType())
       return it->second;
   }
   return base::string16();
 }
 
 }  // namespace autofill