Revert of Enable GetValueFontListForRow and GetLabelFontList in AutofillPopupController for aura A..

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index ecb981db29051fe86878220c3576d003feee9cec..e8540419e9ea57e1720b5382b8dcd07bb36c4752 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -90,7 +90,7 @@
                                   base::string16* title,
                                   base::string16* body) override;
   bool RemoveSuggestion(int list_index) override;
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)

[mfomitchev, 2016/01/06 19:10:14]

Would you mind changing these to use ANDROID_JAVA_UI instead? I think that would
be more consistent with what we are now doing elsewhere.

   const gfx::FontList& GetValueFontListForRow(size_t index) const override;
   const gfx::FontList& GetLabelFontList() const override;
 #endif
@@ -133,7 +133,7 @@
   virtual void InvalidateRow(size_t row);
 
   // Protected so tests can access.
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
@@ -157,7 +157,7 @@
   // when the popup is reused it doesn't leak values between uses.
   void ClearState();
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
@@ -180,7 +180,7 @@
   std::vector<base::string16> elided_values_;
   std::vector<base::string16> elided_labels_;
 
-#if !defined(OS_ANDROID) || defined(USE_AURA)
+#if !defined(OS_ANDROID)
   // The fonts for the popup text.
   gfx::FontList value_font_list_;
   gfx::FontList label_font_list_;