Fix incorrect evaluation of resolution media queries

LayoutTests/fast/media/mq-resolution.html

Index: LayoutTests/fast/media/mq-resolution.html
diff --git a/LayoutTests/fast/media/mq-resolution.html b/LayoutTests/fast/media/mq-resolution.html
index 0620cc017bfa00eff2212ba52e7da06436d900e7..6b966d731f42b4c0108ba1cac896ce10106a9432 100644
--- a/LayoutTests/fast/media/mq-resolution.html
+++ b/LayoutTests/fast/media/mq-resolution.html
@@ -49,19 +49,19 @@
         shouldBe("matchMedia('(min-resolution: 0dpi)').matches", "false");
         shouldBe("matchMedia('(max-resolution: 0dpi)').matches", "false");
 
-        window.internals.settings.setResolutionOverride(144, 144);
+        window.internals.setDeviceScaleFactor(1.5)
         shouldBe("matchMedia('(resolution: 1.5dppx)').matches", "true");
         shouldBe("resolutionFromStyle()", "1.5");
 
-        window.internals.settings.setResolutionOverride(192, 192);
+        window.internals.setDeviceScaleFactor(2);
         shouldBe("matchMedia('(resolution: 2dppx)').matches", "true");
         shouldBe("resolutionFromStyle()", "2");
 
-        window.internals.settings.setResolutionOverride(96, 96);
+        window.internals.setDeviceScaleFactor(1);
         shouldBe("matchMedia('(resolution: 1dppx)').matches", "true");
         shouldBe("resolutionFromStyle()", "1");
 
-        window.internals.settings.setResolutionOverride(216, 216);
+        window.internals.setDeviceScaleFactor(2.25);
         shouldBe("matchMedia('(resolution: 2.25dppx)').matches", "true");
         shouldBe("resolutionFromStyle()", "2.25");
         shouldBe("matchMedia('(resolution)').matches", "true");
@@ -73,26 +73,6 @@
         shouldBe("matchMedia('(min-resolution: 85dpcm)').matches", "true");
         shouldBe("matchMedia('(max-resolution: 85dpcm)').matches", "true");
 
-        window.internals.settings.setResolutionOverride(216, 254);
-        // Non-square must never match.
-        shouldBe("matchMedia('(resolution)').matches", "false");
-        shouldBe("matchMedia('(resolution: 216dpi)').matches", "false");
-        shouldBe("matchMedia('(resolution: 254dpi)').matches", "false");
-
-        shouldBe("matchMedia('(min-resolution: 216dpi)').matches", "true");
-        shouldBe("matchMedia('(min-resolution: 254dpi)').matches", "false");
-        shouldBe("matchMedia('(max-resolution: 216dpi)').matches", "false");
-        shouldBe("matchMedia('(max-resolution: 254dpi)').matches", "true");
-
-        // Non-square must never match.
-        shouldBe("matchMedia('(resolution: 85dpcm)').matches", "false");
-        shouldBe("matchMedia('(resolution: 100dpcm)').matches", "false");
-
-        shouldBe("matchMedia('(min-resolution: 85dpcm)').matches", "true");
-        shouldBe("matchMedia('(min-resolution: 100dpcm)').matches", "false");
-        shouldBe("matchMedia('(max-resolution: 85dpcm)').matches", "false");
-        shouldBe("matchMedia('(max-resolution: 100dpcm)').matches", "true");
-
         // Test printing.
 
         window.internals.settings.setMediaTypeOverride("print");