rAc: update android test

components/autofill/content/browser/wallet/wallet_address.h

 // Copyright 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.
 
 #ifndef COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
+#include "components/autofill/core/browser/phone_number_i18n.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace autofill {
 
 class AutofillProfile;
 class AutofillType;
 
@@ skipping 60 matching lines @@
   scoped_ptr<base::DictionaryValue> ToDictionaryWithoutID() const;
 
   // Returns a string that summarizes this address, suitable for display to
   // the user.
   base::string16 DisplayName() const;
 
   // Returns a string that could be used as a sub-label, suitable for display
   // to the user together with DisplayName().
   base::string16 DisplayNameDetail() const;
 
+  // Returns the phone number as a string that is suitable for display to the
+  // user.
+  base::string16 DisplayPhoneNumber() const;
+
   // Returns data appropriate for |type|.
   base::string16 GetInfo(const AutofillType& type,
                          const std::string& app_locale) const;
 
   const std::string& country_name_code() const { return country_name_code_; }
   const base::string16& recipient_name() const { return recipient_name_; }
   const base::string16& address_line_1() const { return address_line_1_; }
   const base::string16& address_line_2() const { return address_line_2_; }
   const base::string16& locality_name() const { return locality_name_; }
   const base::string16& administrative_area_name() const {
@@ skipping 23 matching lines @@
   void set_locality_name(const base::string16& locality_name) {
     locality_name_ = locality_name;
   }
   void set_administrative_area_name(
       const base::string16& administrative_area_name) {
     administrative_area_name_ = administrative_area_name;
   }
   void set_postal_code_number(const base::string16& postal_code_number) {
     postal_code_number_ = postal_code_number;
   }
-  void set_phone_number(const base::string16& phone_number) {
-    phone_number_ = phone_number;
-  }
+  void SetPhoneNumber(const base::string16& phone_number);
   void set_object_id(const std::string& object_id) {
     object_id_ = object_id;
   }
   void set_is_complete_address(bool is_complete_address) {
     is_complete_address_ = is_complete_address;
   }
 
   // Tests if this address exact matches |other|. |object_id| is ignored.
   bool EqualsIgnoreID(const Address& other) const;
 
@@ skipping 29 matching lines @@
 
   // Despite the name, |postal_code_number_| values are frequently alphanumeric.
   // Examples: "94043", "SW1W", "SW1W 9TQ".
   base::string16 postal_code_number_;
 
   // A valid international phone number. If |phone_number_| is a user provided
   // value, it should have been validated using libphonenumber by clients of
   // this class before being set; see http://code.google.com/p/libphonenumber/.
   base::string16 phone_number_;
 
+  // The parsed phone number.
+  i18n::PhoneObject phone_object_;
+
   // Externalized Online Wallet id for this address.
   std::string object_id_;
 
   // Server's understanding of this address as complete address or not.
   bool is_complete_address_;
 
   // This class is intentionally copyable.
   DISALLOW_ASSIGN(Address);
 };
 
 }  // namespace wallet
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_WALLET_WALLET_ADDRESS_H_