Remove the has_pretty_patch key from layout test results JSON.

third_party/WebKit/LayoutTests/fast/harness/resources/results-test.js

 // To run these tests, load results.html in a browser.
 // You should see a series of PASS lines.
 if (window.testRunner)
     testRunner.dumpAsText();
 
 var testStyles = document.createElement('style');
 testStyles.innerText = ".test-pass { color: green; } .test-fail { color: red; }";
 document.querySelector('head').appendChild(testStyles);
 
 var g_testIndex = 0;
 var g_log = ["You should see a series of PASS lines."];
 
 // Make async actually be sync for the sake of simpler testing.
 function async(func, args)
 {
     func.apply(null, args);
 }
 
 function mockResults()
 {
     return {
         tests: {},
         "skipped": 0,
         "num_regressions": 0,
         "version": 0,
         "num_passes": 0,
         "fixable": 0,
         "num_flaky": 0,
         "layout_tests_dir": "/WEBKITROOT",
-        "has_pretty_patch": false,
         "has_wdiff": false,
         "chromium_revision": 12345,
         "pixel_tests_enabled": true
     };
 }
 
 function isFailureExpected(expected, actual)
 {
     var isExpected = true;
     if (actual != 'SKIP') {
@@ skipping 45 matching lines @@
     g_testIndex++;
     g_state = undefined;
     localStorage.setItem(OptionWriter._key, opt_localStorageValue || '');
 
     try {
         ADD_RESULTS(results);
         originalGeneratePage();
     } catch (e) {
         logFail("FAIL: uncaught exception " + e.toString());
     }
-    
+
     try {
         assertions();
     } catch (e) {
         logFail("FAIL: uncaught exception executing assertions " + e.toString());
     }
 }
 
 function runDefaultSingleRowTest(test, expected, actual, isExpected, textResults, imageResults)
 {
     results = mockResults();
@@ skipping 12 matching lines @@
             assertTrue(document.querySelector('tbody').className == 'expected');
         else
             assertTrue(document.querySelector('tbody').className.indexOf('expected') == -1);
 
         assertTrue(document.querySelector('tbody td:nth-child(1)').textContent == '+' + test + ' \u2691');
         assertTrue(document.querySelector('tbody td:nth-child(2)').textContent == textResults);
         assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == imageResults);
         assertTrue(document.querySelector('tbody td:nth-child(4)').textContent == actual);
         assertTrue(document.querySelector('tbody td:nth-child(5)').textContent == expected);
     });
-    
+
 }
 
 function runTests()
 {
     var results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('PASS', 'TEXT');
     runTest(results, function() {
         assertTrue(document.getElementById('image-results-header').textContent == '');
         assertTrue(document.getElementById('text-results-header').textContent != '');
@@ skipping 29 matching lines @@
     subtree['bar2.html'] = mockExpectation('IMAGE', 'PASS');
     subtree['crash.html'] = mockExpectation('IMAGE', 'CRASH');
     subtree['timeout.html'] = mockExpectation('IMAGE', 'TIMEOUT');
     runTest(results, function() {
         assertTrue(!document.getElementById('results-table'));
 
         var testLinks = document.querySelectorAll('#passes-table .test-link');
         assertTrue(testLinks[0].textContent == 'foo/bar.html');
         assertTrue(testLinks[1].textContent == 'foo/bar1.html');
         assertTrue(testLinks[2].textContent == 'foo/bar2.html');
-        
+
         assertTrue(!document.querySelector('#passes-table .expand-button'));
 
         var expectationTypes = document.querySelectorAll('#passes-table td:last-of-type');
         assertTrue(expectationTypes[0].textContent == 'TEXT');
         assertTrue(expectationTypes[1].textContent == 'CRASH');
         assertTrue(expectationTypes[2].textContent == 'IMAGE');
-        
+
         assertTrue(document.getElementById('crash-tests-table'));
         assertTrue(document.getElementById('crash-tests-table').textContent.indexOf('crash log') != -1);
         assertTrue(document.getElementById('timeout-tests-table'));
         assertTrue(document.getElementById('timeout-tests-table').textContent.indexOf('expected actual diff') != -1);
     });
 
     function isExpanded(expandLink)
     {
         var enDash = '\u2013';
         return expandLink.textContent == enDash;
@@ skipping 12 matching lines @@
     subtree['bar-stderr.html'] = mockExpectation('PASS', 'TEXT');
     subtree['bar-stderr.html'].has_stderr = true;
     subtree['bar-unexpected-pass.html'] = mockExpectation('TEXT', 'PASS');
     runTest(results, function() {
         assertTrue(document.querySelectorAll('tbody tr').length == 5);
         expandAllExpectations();
         assertTrue(document.querySelectorAll('tbody tr').length == 8);
         var expandLinks = document.querySelectorAll('.expand-button-text');
         for (var i = 0; i < expandLinks.length; i++)
             assertTrue(isExpanded(expandLinks[i]));
-        
+
         collapseAllExpectations();
         // Collapsed expectations stay in the dom, but are display:none.
         assertTrue(document.querySelectorAll('tbody tr').length == 8);
         var expandLinks = document.querySelectorAll('.expand-button-text');
         for (var i = 0; i < expandLinks.length; i++)
             assertTrue(isCollapsed(expandLinks[i]));
-            
+
         expandExpectations(expandLinks[1]);
         assertTrue(isCollapsed(expandLinks[0]));
         assertTrue(isExpanded(expandLinks[1]));
 
         collapseExpectations(expandLinks[1]);
         assertTrue(expandLinks[1].textContent == '+');
     });
 
     results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('PASS', 'TEXT');
     subtree['bar-expected-fail.html'] = mockExpectation('TEXT', 'TEXT');
     runTest(results, function() {
         assertTrue(document.querySelectorAll('.expected').length == 1);
         assertTrue(document.querySelector('.expected .test-link').textContent == 'foo/bar-expected-fail.html');
 
         assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] == 'none');
 
         expandAllExpectations();
         assertTrue(visibleExpandLinks().length == 1);
         assertTrue(document.querySelectorAll('.results-row').length == 1);
         assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] == 'none');
-        
+
         document.getElementById('show-expected-failures').checked = true;
         document.getElementById('show-expected-failures').onchange();
 
         assertTrue(visibleExpandLinks().length == 2);
         assertTrue(document.querySelectorAll('.results-row').length == 1);
         assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] != 'none');
-        
+
         expandAllExpectations();
         assertTrue(document.querySelectorAll('.results-row').length == 2);
         assertTrue(window.getComputedStyle(document.querySelectorAll('tbody')[0], null)['display'] != 'none');
     });
-    
+
     results = mockResults();
     results.tests['only-expected-fail.html'] = mockExpectation('TEXT', 'TEXT');
     runTest(results, function() {
         assertTrue(window.getComputedStyle(document.getElementById('results-table').parentNode, null)['display'] == 'none');
     });
 
     runDefaultSingleRowTest('bar-skip.html', 'TEXT', 'SKIP', true, '', '');
-    runDefaultSingleRowTest('bar-flaky-fail.html', 'PASS FAIL', 'TEXT', true, 'expected actual diff ', '');
+    runDefaultSingleRowTest('bar-flaky-fail.html', 'PASS FAIL', 'TEXT', true, 'expected actual diff pretty diff ', '');
     runDefaultSingleRowTest('bar-flaky-fail-unexpected.html', 'PASS TEXT', 'IMAGE', false, '', 'images diff ');
     runDefaultSingleRowTest('bar-audio.html', 'TEXT', 'AUDIO', false, 'expected audio actual audio ', '');
     runDefaultSingleRowTest('bar-image.html', 'TEXT', 'IMAGE', false, '', 'images diff ');
-    runDefaultSingleRowTest('bar-image-plus-text.html', 'TEXT', 'IMAGE+TEXT', false, 'expected actual diff ', 'images diff ');
+    runDefaultSingleRowTest('bar-image-plus-text.html', 'TEXT', 'IMAGE+TEXT', false, 'expected actual diff pretty diff ', 'images diff ');
 
-    // test the mapping for FAIL onto only ['TEXT', 'IMAGE+TEXT', 'AUDIO']
-    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE+TEXT', true, 'expected actual diff ', 'images diff ');
+    // Test the mapping for FAIL onto only ['IMAGE+TEXT', 'AUDIO', 'TEXT', 'IMAGE'].
+    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE+TEXT', true, 'expected actual diff pretty diff ', 'images diff ');
     runDefaultSingleRowTest('bar-image.html', 'FAIL', 'AUDIO', true, 'expected audio actual audio ', '');
-    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'TEXT', true, 'expected actual diff ', '');
+    runDefaultSingleRowTest('bar-image.html', 'FAIL', 'TEXT', true, 'expected actual diff pretty diff ', '');
     runDefaultSingleRowTest('bar-image.html', 'FAIL', 'IMAGE', false, '', 'images diff ');
 
     results = mockResults();
     results.tests['bar-reftest.html'] = mockExpectation('PASS', 'IMAGE');
     results.tests['bar-reftest.html'].reftest_type = ['=='];
     runSingleRowTest(results, false, '', 'ref html images diff ');
 
     results = mockResults();
     results.tests['bar-reftest-mismatch.html'] = mockExpectation('PASS', 'IMAGE');
     results.tests['bar-reftest-mismatch.html'].reftest_type = ['!='];
@@ skipping 50 matching lines @@
         document.body.style.width = '800px';
         var links = document.querySelectorAll('tbody a');
         assertTrue(links[0].getClientRects().length == 2);
         assertTrue(links[1].getClientRects().length == 1);
         document.body.style.width = '';
     });
 
     results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('TEXT', 'TEXT');
-    results.has_pretty_patch = true;
     runTest(results, function() {
         assertTrue(document.querySelector('tbody td:nth-child(2)').textContent.indexOf('pretty diff') != -1);
-        assertTrue(document.querySelector('tbody td:nth-child(2)').textContent.indexOf('wdiff') == -1);
     });
 
     results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('TEXT', 'TEXT');
     results.has_wdiff = true;
     runTest(results, function() {
         assertTrue(document.querySelector('tbody td:nth-child(2)').textContent.indexOf('wdiff') != -1);
-        assertTrue(document.querySelector('tbody td:nth-child(2)').textContent.indexOf('pretty diff') == -1);
+
     });
-    
+
     results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('TEXT', 'PASS');
     subtree['bar-1.html'] = mockExpectation('TEXT', 'CRASH');
     subtree['bar-5.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
     subtree['bar-3.html'] = mockExpectation('PASS', 'TEXT');
     subtree['bar-2.html'] = mockExpectation('PASS', 'IMAGE');
     runTest(results, function() {
         // FIXME: This just ensures we don't get a JS error.
         // Verify that the sort is correct and that inline expanded expectations
@@ skipping 23 matching lines @@
         var mockEvent = {
             target: png,
             clientX: x,
             clientY: y
         }
         PixelZoomer.showOnDelay = false;
         PixelZoomer.handleMouseMove(mockEvent);
         assertTrue(!!document.querySelector('.pixel-zoom-container'));
         assertTrue(document.querySelectorAll('.zoom-image-container').length == 3);
     });
-    
+
     results = mockResults();
     var subtree = results.tests['fullscreen'] = {}
     subtree['full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
     runTest(results, function() {
         // Use a regexp to match windows and unix-style paths.
         var expectedRegExp = new RegExp('^file.*' + results.layout_tests_dir + '/fullscreen/full-screen-api.html$');
         assertTrue(expectedRegExp.exec(document.querySelector('tbody td:first-child a').href));
     });
 
     var oldShouldUseTracLinks = shouldUseTracLinks;
     shouldUseTracLinks = function() { return true; };
-    
+
     results = mockResults();
     var subtree = results.tests['fullscreen'] = {}
     subtree['full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
     runTest(results, function() {
         var expectedHref = 'https://crrev.com/' + results.chromium_revision + '/third_party/WebKit/LayoutTests/fullscreen/full-screen-api.html';
         assertTrue(document.querySelector('tbody td:first-child a').href == expectedHref);
     });
 
     results = mockResults();
     var subtree = results.tests['fullscreen'] = {}
     subtree['full-screen-api.html'] = mockExpectation('TEXT', 'IMAGE+TEXT');
     results.chromium_revision = '';
     runTest(results, function() {
         var expectedHref = 'https://chromium.googlesource.com/chromium/src/+/master/third_party/WebKit/LayoutTests/fullscreen/full-screen-api.html';
         assertTrue(document.querySelector('tbody td:first-child a').href == expectedHref);
     });
 
     shouldUseTracLinks = oldShouldUseTracLinks;
 
     results = mockResults();
     results.tests['bar.html'] = mockExpectation('PASS', 'IMAGE');
     runTest(results, function() {
         assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == 'images diff ');
 
         document.getElementById('toggle-images').checked = false;
         // FIXME: We shouldn't need to call updateTogglingImages. Setting checked above should call it.
         updateTogglingImages();
         // FIXME: We get extra spaces in the DOM every time we enable/disable image toggling.
         assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == 'expected actual  diff ');
-        
+
         document.getElementById('toggle-images').checked = true;
         updateTogglingImages();
         assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == ' images   diff ');
     });
-    
+
     results = mockResults();
     results.tests['reading-options-from-localstorage.html'] = mockExpectation('IMAGE+TEXT', 'IMAGE+TEXT');
     runTest(results, function() {
         assertTrue(window.getComputedStyle(document.querySelector('tbody'), null)['display'] != 'none');
         assertTrue(document.querySelector('tbody td:nth-child(3)').textContent == 'expected actual  diff ');
     }, '{"toggle-images":false,"show-expected-failures":true}');
 
     function enclosingNodeWithTagNameHasClassName(node, tagName, className) {
         while (node && (!node.tagName || node.localName != tagName))
             node = node.parentNode;
@@ skipping 83 matching lines @@
         assertTrue(document.querySelector('#missing-table tbody.expected').getElementsByClassName('result-link')[0].textContent == 'result');
         assertTrue(document.querySelector('#missing-table tbody.expected').getElementsByClassName('result-link')[1].textContent == 'png result');
         assertTrue(document.querySelector('#missing-table tbody:not(.expected) .test-link').textContent == 'foo/unexpected-missing.html');
         assertTrue(document.querySelector('#missing-table tbody:not(.expected) .result-link').textContent == 'result');
 
         document.getElementById('show-expected-failures').checked = true;
         document.getElementById('show-expected-failures').onchange();
         expandAllExpectations();
         assertTrue(visibleExpandLinks().length == 2);
     });
-    
+
 
     results = mockResults();
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('TEXT', 'FAIL');
     subtree['bar1.html'] = mockExpectation('TEXT', 'FAIL');
     subtree['bar2.html'] = mockExpectation('TEXT', 'FAIL');
 
     runTest(results, function() {
         if (window.eventSender) {
             eventSender.keyDown('k'); // previous
@@ skipping 18 matching lines @@
     var subtree = results.tests['foo'] = {}
     subtree['bar.html'] = mockExpectation('TEXT', 'FAIL');
     subtree['bar1.html'] = mockExpectation('TEXT', 'FAIL');
     subtree['bar2.html'] = mockExpectation('TEXT', 'FAIL');
     subtree['bar3.html'] = mockExpectation('TEXT', 'PASS');
     subtree['bar4.html'] = mockExpectation('IMAGE', 'PASS');
 
     runTest(results, function() {
         assertTrue(document.getElementById('results-table'));
         assertTrue(visibleExpandLinks().length == 3);
-        
+
         if (window.eventSender) {
             eventSender.keyDown('i', ["metaKey"]);
             eventSender.keyDown('i', ["shiftKey"]);
             eventSender.keyDown('i', ["ctrlKey"]);
             var testRows = document.querySelectorAll('tbody');
             assertTrue(!testRows[0].classList.contains('current'));
             assertTrue(!testRows[1].classList.contains('current'));
             assertTrue(!testRows[2].classList.contains('current'));
 
             eventSender.keyDown('i'); // first
@@ skipping 196 matching lines @@
     results.tests['foo'].has_repaint_overlay = true;
     runTest(results, function() {
         assertTrue(document.querySelector('tbody td:nth-child(2)').textContent.indexOf('overlay') != -1);
     })
 
     document.body.innerHTML = '<pre>' + g_log.join('\n') + '</pre>';
 }
 
 var originalGeneratePage = generatePage;
 generatePage = runTests;