Remove DataModelWrapper from android build.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.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_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
@@ skipping 383 matching lines @@
   // isn't using Wallet or the user is adding a new instrument or address, NULL
   // will be returned.
   const wallet::WalletItems::MaskedInstrument* ActiveInstrument() const;
   const wallet::Address* ActiveShippingAddress() const;
 
   // Fills in |section|-related fields in |output_| according to the state of
   // |view_|.
   void FillOutputForSection(DialogSection section);
   // As above, but uses |compare| to determine whether a DetailInput matches
   // a field. Saves any new Autofill data to the PersonalDataManager.
-  void FillOutputForSectionWithComparator(DialogSection section,
-                                          const InputFieldComparator& compare);
+  void FillOutputForSectionWithComparator(
+      DialogSection section,
+      const FormStructure::InputFieldComparator& compare);
 
   // Returns whether |form_structure|_| has any fields that match the fieldset
   // represented by |section|.
   bool FormStructureCaresAboutSection(DialogSection section) const;
 
   // Finds all fields of the given |type| in |form_structure_|, if any, and sets
   // each field's value to |output|.
   void SetOutputForFieldsOfType(ServerFieldType type,
                                 const base::string16& output);
 
@@ skipping 38 matching lines @@
       ServerFieldType type,
       const base::string16& field_contents,
       const DetailInputs& inputs,
       std::vector<base::string16>* popup_values,
       std::vector<base::string16>* popup_labels,
       std::vector<base::string16>* popup_icons);
 
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
 
+  // Returns just the |type| attributes of RequestedFieldsForSection(section).
+  std::vector<ServerFieldType> RequestedTypesForSection(DialogSection section);

[aruslan, 2014/01/27 19:05:36]

nit: const?

+
   // Returns the country code (e.g. "US") for |section|.
   std::string CountryCodeForSection(DialogSection section);
 
   // Hides |popup_controller_|'s popup view, if it exists.
   void HidePopup();
 
   // Set whether the currently editing |section| was originally based on
   // existing Wallet or Autofill data.
   void SetEditingExistingData(DialogSection section, bool editing);
 
@@ skipping 299 matching lines @@
 
   // A username string we display in the card scrambling/generated overlay.
   base::string16 submitted_cardholder_name_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_