diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -1566,12 +1566,7 @@
           "-Wno-implicit-fallthrough",
         ]
 
+        cflags += [ "-Wno-max-tokens" ]
-        if (enable_wmax_tokens) {
-          cflags += [ "-Wmax-tokens" ]
-        } else {
-          # TODO(https://crbug.com/1049569): Remove after Clang 87b235db.
-          cflags += [ "-Wno-max-tokens" ]
-        }
       }
     }
   }