Stop passing browser command line args for no_gpu_process on Android.

content/test/gpu/page_sets/gpu_process_tests.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import sys
 from telemetry.story import story_set as story_set_module
 from telemetry.page import page_test
 
 from gpu_tests import gpu_test_base
 
 class GpuProcessSharedPageState(gpu_test_base.GpuSharedPageState):
@@ skipping 199 matching lines @@
       raise page_test.Failure('Must have a non-empty gl_renderer string')
 
 
 class NoGpuProcessSharedPageState(GpuProcessSharedPageState):
   def __init__(self, test, finder_options, story_set):
     super(NoGpuProcessSharedPageState, self).__init__(
       test, finder_options, story_set)
     options = finder_options.browser_options
 
     if options.browser_type.startswith('android'):
-      # Hit id 8 from kSoftwareRenderingListJson, which applies to any platform.
-      options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de')
-      options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0324')
+      # Android doesn't support starting up the browser without any
+      # GPU process. This test is skipped on Android in
+      # gpu_process_expectations.py, but we must at least be able to
+      # bring up the browser in order to detect that the test
+      # shouldn't run. Faking a vendor and device ID can get the
+      # browser into a state where it won't launch.
+      pass
     elif sys.platform in ('cygwin', 'win32'):
       # Hit id 34 from kSoftwareRenderingListJson.
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x5333')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x8811')
     elif sys.platform.startswith('linux'):
       # Hit id 50 from kSoftwareRenderingListJson.
       options.AppendExtraBrowserArgs('--gpu-no-complete-info-collection')
       options.AppendExtraBrowserArgs('--gpu-testing-vendor-id=0x10de')
       options.AppendExtraBrowserArgs('--gpu-testing-device-id=0x0de1')
       options.AppendExtraBrowserArgs('--gpu-testing-gl-vendor=VMware')
@@ skipping 526 matching lines @@
 
       # There is currently no entry in kSoftwareRenderingListJson that enables
       # a software GL driver on Android.
       self.AddStory(SoftwareGpuProcessPage(self, expectations))
 
   @property
   def allow_mixed_story_states(self):
     # Return True here in order to be able to run pages with different browser
     # command line arguments.
     return True