ui: Cleanup class/struct forward declarations

skia/config/SkUserConfig.h

Index: skia/config/SkUserConfig.h
diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index c477486bdc845afeff0e8c098b83c039929cd159..2d03a0d7499d8c225cdedbab16280eb711c51eb6 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -228,10 +228,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 #   define SK_SUPPORT_LEGACY_EVAL_CUBIC
 #endif
 
-#ifndef    SK_ANALYTIC_AA
-#   define SK_ANALYTIC_AA
-#endif
-
 ///////////////////////// Imported from BUILD.gn and skia_common.gypi
 
 /* In some places Skia can use static initializers for global initialization,
@@ -265,6 +261,10 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 // Enabling the screenspace AA tessellating path renderer needs rebaselines.
 #define SK_DISABLE_SCREENSPACE_TESS_AA_PATH_RENDERER
 
+// Disable analytic AA until we fix all the Chrome tests.
+// (we now set analytic AA as default in Skia.)
+#define SK_NO_ANALYTIC_AA
+
 // ===== End Chrome-specific definitions =====
 
 #endif