Remove layoutTestController, an alias to testRunner

Bug: 
Change-Id: I5a3cc233bfc3daa96f8fa5258dc2cba0d1740fa1
Reviewed-on: https://chromium-review.googlesource.com/618432Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Takeshi Yoshino <tyoshino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495525}

content/shell/test_runner/test_runner.cc

@@ -323,11 +323,7 @@ void TestRunnerBindings::Install(
   v8::Local<v8::Object> global = context->Global();
   v8::Local<v8::Value> v8_bindings = bindings.ToV8();
 
-  std::vector<std::string> names;
-  names.push_back("testRunner");
-  names.push_back("layoutTestController");
-  for (size_t i = 0; i < names.size(); ++i)
-    global->Set(gin::StringToV8(isolate, names[i].c_str()), v8_bindings);
+  global->Set(gin::StringToV8(isolate, "testRunner"), v8_bindings);
 
   // The web-platform-tests suite require that reference comparison is delayed
   // for any test with a 'reftest-wait' class on the root element, until that

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-properties-after-frame-navigated-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests access of cached DOMWindow properties after the associated frame is navigated. Test should not crash and properties should be set to sane defaults.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-properties-after-frame-removed-and-gced-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests access of cached DOMWindow properties after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-properties-after-frame-removed-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests access of cached DOMWindow properties after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-window-after-frame-navigated-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests property access on a cached DOMWindow after the associated frame is navigated. Test should not crash and properties read from the cached DOMWindow should be identical to properties through the 'current' DOMWindow.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-and-gced-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests property access on a cached DOMWindow after the associated frame is removed from a web page and garbage collected. Test should not crash and properties should be set to sane defaults.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/property-access-on-cached-window-after-frame-removed-expected.txt

-CONSOLE WARNING: line 117: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
+CONSOLE WARNING: line 116: 'window.webkitStorageInfo' is deprecated. Please use 'navigator.webkitTemporaryStorage' or 'navigator.webkitPersistentStorage' instead.
 Tests property access on a cached DOMWindow after the associated frame is no longer in a web page. Test should not crash and properties should be set to sane defaults.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".

third_party/WebKit/LayoutTests/fast/dom/Window/resources/window-property-collector.js

@@ -18,7 +18,6 @@ function emitExpectedResult(path, expected)
     if (path[0] == 'internals'
         || path[0] == 'clientInformation' // Just an alias for navigator.
         || path[0] == 'testRunner' // Skip testRunner since they are only for testing.
-        || path[0] == 'layoutTestController' // Just an alias for testRunner.
         || path[0] == 'eventSender') { // Skip eventSender since they are only for testing.
         return;
     }

third_party/WebKit/LayoutTests/fast/dom/adopt-attribute-crash.svg

@@ -3,8 +3,8 @@
 <linearGradient xl:href="#tCF2" xlink:href="resources/smiley.png"></linearGradient>
 </svg>
 <script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
+if (window.testRunner)
+    testRunner.dumpAsText();
 
 var element = document.querySelector('linearGradient');
 var attr1 = element.attributes[0];

third_party/WebKit/LayoutTests/fast/harness/testrunner-object.html

@@ -3,24 +3,10 @@
 <body>
 <pre><script>
 
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
 if (window.testRunner)
     testRunner.dumpAsText();
 
 document.writeln(window.testRunner ? "PASS - window.testRunner exists" : "FAIL - window.testRunner doesn't");
-if (window.layoutTestController) {
-    for (var property in window.testRunner) {
-        if (!(property in window.layoutTestController))
-            document.write("Property " + property + " exists on testRunner but doesn't exist on layoutTestController");
-    }
-    for (var property in window.layoutTestController) {
-        if (!(property in window.testRunner))
-            document.write("Property " + property + " exists on layoutTestController but doesn't exist on testRunner");
-    }
-}
-
 document.writeln('Done');
 
 </script></pre>

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-success-no-content-type.html

@@ -8,9 +8,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -18,14 +18,14 @@ var xhr = new XMLHttpRequest();
 xhr.open("POST", "http://localhost:8000/xmlhttprequest/resources/access-control-basic-post-success-no-content-type.php");
 xhr.onerror = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     if (xhr.readyState == 4) {
         log(xhr.responseText);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 };
 xhr.send('Test');

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-data-saver.html

@@ -9,22 +9,22 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
 xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-request-invalid-status.php?code=400");
 xhr.onerror = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     log("PASS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.send();
 </script>

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-request-headers-origin.html

@@ -7,9 +7,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -17,14 +17,14 @@ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-p
 xhr.setRequestHeader("X-Custom-Header", "PASS");
 xhr.onerror = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onreadystatechange = function () {
     if (xhr.readyState == 4) {
         log(xhr.responseText);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 };
 xhr.send();

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-request-invalid-status-301.html

@@ -7,9 +7,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -17,13 +17,13 @@ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-p
 xhr.setRequestHeader("X-Custom-Header", "PASS");
 xhr.onerror = function () {
     log("PASS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.send();
 </script>

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-request-invalid-status-400.html

@@ -7,9 +7,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -17,13 +17,13 @@ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-p
 xhr.setRequestHeader("X-Custom-Header", "PASS");
 xhr.onerror = function () {
     log("PASS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.send();
 </script>

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-request-invalid-status-501.html

@@ -7,9 +7,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -18,13 +18,13 @@ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-p
 xhr.setRequestHeader("X-Custom-Header", "PASS");
 xhr.onerror = function () {
     log("PASS");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.send();
 </script>

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/redirect-cors-origin-null.html

@@ -8,23 +8,23 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
 xhr.open("GET", "http://localhost:8080/xmlhttprequest/resources/redirect-cors-origin-null.php");
 xhr.onerror = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onreadystatechange = function () {
     if (xhr.readyState == 4) {
         log(xhr.responseText);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 };
 xhr.send();

third_party/WebKit/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-no-content-type-with-text.html

@@ -7,9 +7,9 @@ function log(message) {
     document.getElementById("log").innerHTML += message + "<br>";
 }
 
-if (window.layoutTestController) {
-    layoutTestController.dumpAsText();
-    layoutTestController.waitUntilDone();
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    testRunner.waitUntilDone();
 }
 
 var xhr = new XMLHttpRequest();
@@ -17,14 +17,14 @@ var xhr = new XMLHttpRequest();
 xhr.open("POST", "resources/xmlhttprequest-no-content-type-with-text.php");
 xhr.onerror = function () {
     log("FAIL");
-    if (window.layoutTestController)
-        layoutTestController.notifyDone();
+    if (window.testRunner)
+        testRunner.notifyDone();
 };
 xhr.onload = function () {
     if (xhr.readyState == 4) {
         log(xhr.responseText);
-        if (window.layoutTestController)
-            layoutTestController.notifyDone();
+        if (window.testRunner)
+            testRunner.notifyDone();
     }
 };
 xhr.send('Test');

third_party/WebKit/LayoutTests/platform/mac/virtual/stable/webexposed/global-interface-listing-expected.txt

@@ -7949,7 +7949,6 @@ interface webkitURL
     attribute gamepadController
     attribute gin
     attribute internals
-    attribute layoutTestController
     attribute length
     attribute location
     attribute opener

third_party/WebKit/LayoutTests/platform/win/virtual/stable/webexposed/global-interface-listing-expected.txt

@@ -7878,7 +7878,6 @@ interface webkitURL
     attribute gamepadController
     attribute gin
     attribute internals
-    attribute layoutTestController
     attribute length
     attribute location
     attribute opener

third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt

@@ -8985,7 +8985,6 @@ interface webkitURL
     attribute gamepadController
     attribute gin
     attribute internals
-    attribute layoutTestController
     attribute length
     attribute location
     attribute opener