Rename layoutTestController to testRunner.

content/test/layout_browsertest.cc

 // 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.
 
 #include "content/test/layout_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 49 matching lines @@
 void ScrapeResultFromBrowser(content::Shell* window, std::string* actual_text) {
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
       window->web_contents()->GetRenderViewHost(),
       L"",
       L"window.domAutomationController.send(document.body.innerText);",
       actual_text));
 }
 
 static const std::string preamble =
       "\n<script>\n"
-      "function LayoutTestController() {\n"
+      "function TestRunner() {\n"
       "  this.wait_until_done_ = false;\n"
       "  this.dumpAsText = function () {};\n"
       "  this.waitUntilDone = function () {\n"
       "    this.wait_until_done_ = true;\n"
       "  }\n"
       "  this.notifyDone = function () {\n"
       "    document.title = 'done';\n"
       "  }\n"
       "  this.overridePreference = function () {}\n"
       "  this.OnEvent = function () {\n"
-      "    if (!layoutTestController.wait_until_done_)\n"
-      "      layoutTestController.notifyDone();\n"
+      "    if (!testRunner.wait_until_done_)\n"
+      "      testRunner.notifyDone();\n"
       "  }\n"
       "  this.workerThreadCount = 0; \n"
       "}\n"
-      "window.layoutTestController = new LayoutTestController();\n"
-      "window.testRunner = window.layoutTestController;\n"
-      "window.addEventListener('load', layoutTestController.OnEvent, false);\n"
+      "window.testRunner = new TestRunner();\n"
+      "window.addEventListener('load', testRunner.OnEvent, false);\n"
       "</script>";
 
 }
 
 InProcessBrowserLayoutTest::InProcessBrowserLayoutTest(
     const FilePath& test_parent_dir, const FilePath& test_case_dir)
     : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
       port_(-2) {
 }
 
@@ skipping 151 matching lines @@
   ASSERT_TRUE(file_util::ReadFileToString(path_to_single_test, &test_html));
 
   size_t insertion_position = FindInsertPosition(test_html);
   test_html.insert(insertion_position, preamble);
   *test_path = our_layout_test_temp_dir_.Append(test_case_dir_);
   *test_path = test_path->AppendASCII(test_case_file_name);
   ASSERT_TRUE(file_util::WriteFile(*test_path,
                                    &test_html.at(0),
                                    static_cast<int>(test_html.size())));
 }