Prefer device type instead of machine name for scale factor overrides.

content/test/gpu/gpu_tests/pixel.py

 # Copyright (c) 2012 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 glob
 import json
 import os
 import re
 
 from gpu_tests import cloud_storage_test_base
 from gpu_tests import pixel_expectations
@@ skipping 61 matching lines @@
       screenshot = image_util.Crop(
           screenshot, page.test_rect[0] * dpr, page.test_rect[1] * dpr,
           page.test_rect[2] * dpr, page.test_rect[3] * dpr)
 
     if hasattr(page, 'expected_colors'):
       # Use expected pixels instead of ref images for validation.
       expected_colors_file = os.path.abspath(os.path.join(
           os.path.dirname(__file__), page.expected_colors))
       expected_colors = self._ReadPixelExpectations(expected_colors_file)
       self._ValidateScreenshotSamples(
-          page.display_name, screenshot, expected_colors, dpr)
+          tab, page.display_name, screenshot, expected_colors, dpr)
       return
 
     image_name = self._UrlToImageName(page.display_name)
 
     if self.options.upload_refimg_to_cloud_storage:
       if self._ConditionallyUploadToCloudStorage(image_name, page, tab,
                                                  screenshot):
         # This is the new reference image; there's nothing to compare against.
         ref_png = screenshot
       else:
@@ skipping 89 matching lines @@
 
   def CreateStorySet(self, options):
     story_set = page_sets.PixelTestsStorySet(self.GetExpectations(),
                                              try_es3=True)
     for page in story_set:
       page.script_to_evaluate_on_commit = test_harness_script
     return story_set
 
   def _CreateExpectations(self):
     return pixel_expectations.PixelExpectations()