Merge to XFA: Partial revert of commit c6d8683 to fix a GN + Win/Clang build warning.

BUG=547906
TBR=thakis@chromium.org

Review URL: https://codereview.chromium.org/1420503012 .

(cherry picked from commit f7a8b34f520f1d4892f009700972ab2995ed2681)

Review URL: https://codereview.chromium.org/1415453004 .

1 files changed, 3 insertions, 1 deletions

diff --git a/BUILD.gn b/BUILD.gn
index fff4ad4bdc..d1353c477d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -579,9 +579,11 @@ static_library("fxge") {
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
-    ":fxge_warnings",
     ":pdfium_config",
     "//build/config/compiler:no_chromium_code",
+    # As of this writing, this needs to be last to suppress a -Wswitch warning.
+    # https://crbug.com/547906
+    ":fxge_warnings",
   ]
 
   if (pdf_use_skia) {