Use ANDROID_JAVA_UI build flag for UI elements in Chrome dir

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 2f67f45093d68d644043654875dd2212e0f1f846..19bcf0238473a1446469783f4a50f824e631f362 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -14,6 +14,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/popup_controller_common.h"
+#include "chrome/common/features.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ -92,7 +93,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
                                   base::string16* title,
                                   base::string16* body) override;
   bool RemoveSuggestion(int list_index) override;
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   const gfx::FontList& GetValueFontListForRow(size_t index) const override;
   const gfx::FontList& GetLabelFontList() const override;
 #endif
@@ -135,7 +136,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
   virtual void InvalidateRow(size_t row);
 
   // Protected so tests can access.
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)

[Evan Stade, 2016/01/09 00:03:02]

imo this is sort of hard to read. On the one hand, it makes sense that Windows
doesn't define ANDROID_JAVA_UI but on the other hand, this looks like something
that should only be relevant to android. This is more readable if you ask me:

if !(defined(OS_ANDROID) && BUILDFLAG(ANDROID_JAVA_UI))

This is longer so it's understandable if you don't like it. Just my two cents.

[bshe, 2016/01/11 15:52:02]

I see your point. It is indeed more clear but longer. There were other places
that use the same
short version. So I would lean toward to keep it as it is if you dont mind.
Since the flag has
ANDROD in it, so it shouldn't be too hard to associated the flag with ANDROID
platform only.

   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
@@ -159,7 +160,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
   // when the popup is reused it doesn't leak values between uses.
   void ClearState();
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
@@ -182,7 +183,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
   std::vector<base::string16> elided_values_;
   std::vector<base::string16> elided_labels_;
 
-#if !defined(OS_ANDROID)
+#if !BUILDFLAG(ANDROID_JAVA_UI)
   // The fonts for the popup text.
   gfx::FontList value_font_list_;
   gfx::FontList label_font_list_;