view-manager: Use --override-use-gl-with-osmesa-for-tests for apptests on non-android.

mojo/tools/data/apptests

Index: mojo/tools/data/apptests
diff --git a/mojo/tools/data/apptests b/mojo/tools/data/apptests
index abbde4fc55fd18de2de5389f3b54e63a4b7a639e..3872016feca3566e619edfc58321410196f92678 100644
--- a/mojo/tools/data/apptests
+++ b/mojo/tools/data/apptests
@@ -21,6 +21,13 @@
 #
 # TODO(vtl|msw): Add a way of specifying data dependencies.
 
+view_manager_apptests = { 'test': 'mojo:view_manager_apptests' }
+# osmesa is not used on android, so no flags are needed for
+# view_manager_apptests.
+if config.target_os != config.OS_ANDROID:
+  view_manager_apptests['args'] = [ '--use-x11-test-config',
+                                    '--override-use-gl-with-osmesa-for-tests' ]
+
 tests = [
   {
     'test': 'mojo:clipboard_apptests',
@@ -39,11 +46,7 @@ tests = [
   #  'test': 'mojo:runner_apptests',
   #  'type': 'gtest_isolated',
   #},
-  {
-    'test': 'mojo:view_manager_apptests',
-    'args': ['--use-x11-test-config',
-             '--override-use-gl-with-osmesa-for-tests']
-  },
+  view_manager_apptests,
 ]
 
 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220