Test msaa on bots using dm. 4 samples for Android, 16 elsewhere

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

tools/dm_flags.json

@@ -4,6 +4,7 @@
     "565", 
     "8888", 
     "gpu", 
+    "msaa4", 
     "nvprmsaa4", 
     "serialize-8888", 
     "tiles_rt-8888", 
@@ -44,6 +45,7 @@
     "565", 
     "8888", 
     "gpu", 
+    "msaa4", 
     "nvprmsaa4", 
     "--blacklist", 
     "gpu", 
@@ -80,7 +82,8 @@
     "565", 
     "8888", 
     "gpu", 
-    "nvprmsaa4", 
+    "msaa16", 
+    "nvprmsaa16", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -100,7 +103,8 @@
     "565", 
     "8888", 
     "gpu", 
-    "nvprmsaa4", 
+    "msaa16", 
+    "nvprmsaa16", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
@@ -120,7 +124,8 @@
     "565", 
     "8888", 
     "gpu", 
-    "nvprmsaa4", 
+    "msaa16", 
+    "nvprmsaa16", 
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 

tools/dm_flags.py

@@ -22,7 +22,16 @@ cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
-  configs = ['565', '8888', 'gpu', 'nvprmsaa4']
+  configs = ['565', '8888', 'gpu']
+  # The S4 crashes and the NP produces a long error stream when we run with
+  # MSAA.
+  if ('GalaxyS4'    not in bot and
+      'NexusPlayer' not in bot):
+    if 'Android' in bot:
+      configs.extend(['msaa4', 'nvprmsaa4'])
+    else:
+      configs.extend(['msaa16', 'nvprmsaa16'])
+
   # Xoom and NP are running out of RAM when we run all these modes.  skia:3255
   if ('Xoom'        not in bot and
       'NexusPlayer' not in bot):