Change naming convention for Android pixel reference images.

content/test/gpu/gpu_tests/cloud_storage_test_base.py

 # Copyright 2013 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.
 
 """Base classes for a test and validator which upload results
 (reference images, error images) to cloud storage."""
 
 import logging
 import os
 import re
@@ skipping 78 matching lines @@
 
 class ValidatorBase(gpu_test_base.ValidatorBase):
   def __init__(self):
     super(ValidatorBase, self).__init__()
     # Parameters for cloud storage reference images.
     self.vendor_id = None
     self.device_id = None
     self.vendor_string = None
     self.device_string = None
     self.msaa = False
+    self.model_name = None
 
   ###
   ### Routines working with the local disk (only used for local
   ### testing without a cloud storage account -- the bots do not use
   ### this code path).
   ###
 
   def _UrlToImageName(self, url):
     image_name = re.sub(r'^(http|https|file)://(/*)', '', url)
     image_name = re.sub(r'\.\./', '', image_name)
@@ skipping 49 matching lines @@
     else:
       raise Exception('GPU device information was incomplete')
     # TODO(senorblanco): This should probably be checking
     # for the presence of the extensions in system_info.gpu_aux_attributes
     # in order to check for MSAA, rather than sniffing the blacklist.
     self.msaa = not (
         ('disable_chromium_framebuffer_multisample' in
           system_info.gpu.driver_bug_workarounds) or
         ('disable_multisample_render_to_texture' in
           system_info.gpu.driver_bug_workarounds))
+    self.model_name = system_info.model_name
 
   def _FormatGpuInfo(self, tab):
     self._ComputeGpuInfo(tab)
     msaa_string = '_msaa' if self.msaa else '_non_msaa'
     if self.vendor_id:
       return '%s_%04x_%04x%s' % (
         self.options.os_type, self.vendor_id, self.device_id, msaa_string)
     else:
-      return '%s_%s_%s%s' % (
+      # This is the code path for Android devices. Include the model
+      # name (e.g. "Nexus 9") in the GPU string to disambiguate
+      # multiple devices on the waterfall which might have the same
+      # device string ("NVIDIA Tegra") but different screen
+      # resolutions and device pixel ratios.
+      return '%s_%s_%s_%s%s' % (
         self.options.os_type, self.vendor_string, self.device_string,
-        msaa_string)
+        self.model_name, msaa_string)
 
   def _FormatReferenceImageName(self, img_name, page, tab):
     return '%s_v%s_%s.png' % (
       img_name,
       page.revision,
       self._FormatGpuInfo(tab))
 
   def _UploadBitmapToCloudStorage(self, bucket, name, bitmap, public=False):
     # This sequence of steps works on all platforms to write a temporary
     # PNG to disk, following the pattern in bitmap_unittest.py. The key to
@@ skipping 104 matching lines @@
         default='')
     group.add_option('--test-machine-name',
         help='Name of the test machine. Specifying this argument causes this '
         'script to upload failure images and diffs to cloud storage directly, '
         'instead of relying on the archive_gpu_pixel_test_results.py script.',
         default='')
     group.add_option('--generated-dir',
         help='Overrides the default on-disk location for generated test images '
         '(only used for local testing without a cloud storage account)',
         default=default_generated_data_dir)