rAc: update android test

chrome/browser/ui/autofill/data_model_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_
 
 #include "base/compiler_specific.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
@@ skipping 21 matching lines @@
 // regardless of their type. Implementations are intended to be lightweight and
 // copyable, only holding weak references to their backing model.
 class DataModelWrapper {
  public:
   virtual ~DataModelWrapper();
 
   // Fills in |inputs| with the data that this model contains (|inputs| is an
   // out-param).
   void FillInputs(DetailInputs* inputs);
 
-  // Returns the data for a specific autocomplete type.
+  // Returns the data for a specific autocomplete type in a format for filling
+  // into a web form.
   virtual base::string16 GetInfo(const AutofillType& type) const = 0;
 
+  // Returns the data for a specified type in a format optimized for displaying
+  // to the user.
+  virtual base::string16 GetInfoForDisplay(const AutofillType& type) const;
+
   // Returns the icon, if any, that represents this model.
   virtual gfx::Image GetIcon();
 
   // Gets text to display to the user to summarize this data source. The
   // default implementation assumes this is an address. Both params are required
   // to be non-NULL and will be filled in with text that is vertically compact
   // (but may take up a lot of horizontal space) and horizontally compact (but
   // may take up a lot of vertical space) respectively. The return value will
   // be true and the outparams will be filled in only if the data represented is
   // complete and valid.
@@ skipping 41 matching lines @@
 // A DataModelWrapper for Autofill profiles.
 class AutofillProfileWrapper : public DataModelWrapper {
  public:
   explicit AutofillProfileWrapper(const AutofillProfile* profile);
   AutofillProfileWrapper(const AutofillProfile* profile,
                          const AutofillType& variant_type,
                          size_t variant);
   virtual ~AutofillProfileWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
+      OVERRIDE;
 
  protected:
   virtual void FillFormField(AutofillField* field) const OVERRIDE;
 
   // Returns the variant that should be used when dealing with an element that
   // has the given |type|.
   size_t GetVariantForType(const AutofillType& type) const;
 
  private:
   const AutofillProfile* profile_;
@@ skipping 37 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(AutofillCreditCardWrapper);
 };
 
 // A DataModelWrapper for Wallet addresses.
 class WalletAddressWrapper : public DataModelWrapper {
  public:
   explicit WalletAddressWrapper(const wallet::Address* address);
   virtual ~WalletAddressWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
+      OVERRIDE;
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
 
  private:
   const wallet::Address* address_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletAddressWrapper);
 };
 
 // A DataModelWrapper for Wallet instruments.
 class WalletInstrumentWrapper : public DataModelWrapper {
  public:
   explicit WalletInstrumentWrapper(
       const wallet::WalletItems::MaskedInstrument* instrument);
   virtual ~WalletInstrumentWrapper();
 
   virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
+      OVERRIDE;
   virtual gfx::Image GetIcon() OVERRIDE;
   virtual bool GetDisplayText(base::string16* vertically_compact,
                               base::string16* horizontally_compact) OVERRIDE;
 
  private:
   const wallet::WalletItems::MaskedInstrument* instrument_;
 
   DISALLOW_COPY_AND_ASSIGN(WalletInstrumentWrapper);
 };
 
@@ skipping 37 matching lines @@
 
  private:
   const DetailOutputMap& outputs_;
 
   DISALLOW_COPY_AND_ASSIGN(DetailOutputWrapper);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_DATA_MODEL_WRAPPER_H_