Skip gl surface init when headless; enable wm apptests.

components/native_viewport/main.cc

Index: components/native_viewport/main.cc
diff --git a/components/native_viewport/main.cc b/components/native_viewport/main.cc
index ac74808b3e3390ff134f09289fe996070a9f11cf..1ebfb270df26bcdf2c6dabb935e702953c9372db 100644
--- a/components/native_viewport/main.cc
+++ b/components/native_viewport/main.cc
@@ -37,12 +37,13 @@ class NativeViewportAppDelegate : public mojo::ApplicationDelegate,
     tracing_.Initialize(application);
 
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(mojo::kUseTestConfig))
-      gfx::GLSurface::InitializeOneOffForTests();
-    else
-      gfx::GLSurface::InitializeOneOff();
-
     is_headless_ = command_line->HasSwitch(mojo::kUseHeadlessConfig);
+    if (!is_headless_) {
+      if (command_line->HasSwitch(mojo::kUseTestConfig))
+        gfx::GLSurface::InitializeOneOffForTests();
+      else
+        gfx::GLSurface::InitializeOneOff();
+    }
   }
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {