Skip gl surface init when headless; enable wm apptests.

components/native_viewport/public/cpp/lib/args.cc

Index: components/native_viewport/public/cpp/lib/args.cc
diff --git a/components/native_viewport/public/cpp/lib/args.cc b/components/native_viewport/public/cpp/lib/args.cc
index 2c842879338bc34cf51e58b6243ba8d80154836f..f7a9ce0332d6fe81cb5000926df50b4a156dac50 100644
--- a/components/native_viewport/public/cpp/lib/args.cc
+++ b/components/native_viewport/public/cpp/lib/args.cc
@@ -6,12 +6,9 @@
 
 namespace mojo {
 
-// Instead of using the system GL implementation, use OSMesa.
-const char kUseOSMesa[] = "use-osmesa";
-// Loads an app from the specified directory and launches it.
-// Force gl to be initialized in test mode.
-const char kUseTestConfig[] = "use-test-config";
 // Create native viewport in headless mode.
 const char kUseHeadlessConfig[] = "use-headless-config";
+// Force gl to be initialized in test mode.
+const char kUseTestConfig[] = "use-test-config";
 
 }  // namespace mojo