🤠 Revert "WebUI: Fork mock_controller for ChromeOS closure"

This reverts commit 74390b3.

Reason for revert: seems to break DiagnosticsAppWithInput_TouchpadTester.All per https://bugs.chromium.org/p/chromium/issues/detail?id=1382639

Original change's description:
> WebUI: Fork mock_controller for ChromeOS closure
>
> Adding file as mock_controller.m.js, since mock_controller.js already
> exists in chrome/test/data/webui/chromeos and corresponds to the
> pre-JS-modules file. This file is still needed by
> DefaultKeyboardExtensionBrowserTests.
>
> Migrating diagnostics and scanning app tests to use mock_controller.m
> since they rely on closure compiler. Other CrOS users of
> mock_controller can use the TS version.
>
> Bug: 1316438
> Change-Id: I6d426b1e2f315fe282214d78f37bf67ab09b2748
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4009163
> Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
> Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1068898}

Bug: 1316438, 1382639
Change-Id: Ic8cb7823f78c90df1aaa5d4be4fdf454391daa62
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4016280
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Thiemo Nagel <tnagel@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1069062}

chrome/test/data/webui/BUILD.gn

@@ -318,6 +318,9 @@ js_type_check("closure_compile_local") {
   ]
 }
 
+js_library("mock_controller") {
+}
+
 js_library("test_util") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
@@ -394,6 +397,7 @@ ts_definitions("generate_definitions") {
   root_dir = "./"
   out_dir = "$target_gen_dir/tsc"
   js_files = [
+    "mock_controller.js",
     "mojo_webui_test_support.js",
     "test_util.js",
   ]
@@ -425,7 +429,6 @@ ts_library("build_ts") {
     "color_provider_css_colors_test_chromeos.ts",
     "cr_focus_row_mixin_test.ts",
     "fake_chrome_event.ts",
-    "mock_controller.ts",
     "mock_timer.ts",
     "mock_timer_test.ts",
     "polymer_test_util.ts",
@@ -459,6 +462,7 @@ generate_grd("build_grd") {
   input_files = [
     "chai_assert.js",
     "mocha_adapter.js",
+    "mock_controller.js",
     "mojo_webui_test_support.js",
     "test_browser_proxy.js",
     "test_util.js",
@@ -469,7 +473,6 @@ generate_grd("build_grd") {
 
   if (is_chromeos_ash) {
     input_files += [
-      "chromeos/mock_controller.js",
       "chromeos/arc_account_picker/test_util.js",
       "chromeos/ash_common/i18n_behavior_test.js",
       "chromeos/fake_network_config_mojom.js",

chrome/test/data/webui/chromeos/BUILD.gn

@@ -14,10 +14,7 @@ js_type_check("closure_compile_local") {
                                                     root_build_dir),
                     "js_module_root=./gen/chrome/test/data/webui/",
                   ]
-  deps = [
-    ":fake_network_config_mojom",
-    ":mock_controller.m",
-  ]
+  deps = [ ":fake_network_config_mojom" ]
 }
 
 js_library("fake_network_config_mojom") {
@@ -28,9 +25,6 @@ js_library("fake_network_config_mojom") {
   ]
 }
 
-js_library("mock_controller.m") {
-}
-
 group("closure_compile") {
   public_deps = [
     ":closure_compile_local",

chrome/test/data/webui/chromeos/diagnostics/BUILD.gn

@@ -278,8 +278,8 @@ js_library("ip_config_info_drawer_test") {
 
 js_library("keyboard_tester_test") {
   deps = [
-    "..:mock_controller.m",
     "../..:chai_assert",
+    "../..:mock_controller",
     "../..:test_util",
     "//ash/webui/diagnostics_ui/mojom:mojom_webui_js",
     "//ash/webui/diagnostics_ui/resources:keyboard_tester",

chrome/test/data/webui/chromeos/diagnostics/drawing_provider_test.js

@@ -9,7 +9,7 @@ import {CanvasDrawingProvider} from 'chrome://diagnostics/drawing_provider.js';
 import {constructRgba, DESTINATION_OVER, LINE_CAP, LINE_WIDTH, lookupCssVariableValue, MARK_COLOR, MARK_OPACITY, MARK_RADIUS, TRAIL_COLOR, TRAIL_MAX_OPACITY} from 'chrome://diagnostics/drawing_provider_utils.js';
 
 import {assertDeepEquals, assertEquals} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 
 /**
  * FakeCanvasCtx class mocks various html Canvas API methods to make it easy to

chrome/test/data/webui/chromeos/diagnostics/drawing_provider_utils_test.js

@@ -8,7 +8,7 @@ import 'chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js';
 import {constructRgba, getTrailOpacityFromPressure, lookupCssVariableValue, MARK_COLOR, MARK_OPACITY, TRAIL_COLOR, TRAIL_MAX_OPACITY} from 'chrome://diagnostics/drawing_provider_utils.js';
 
 import {assertEquals} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 
 // A helper function to mock getPropertyValue function.
 const mockGetPropertyValue = (valName) => {

chrome/test/data/webui/chromeos/diagnostics/keyboard_tester_test.js

@@ -11,7 +11,7 @@ import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 import {eventToPromise} from 'chrome://webui-test/test_util.js';
 
 import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 
 suite('keyboardTesterTestSuite', function() {
   /** @type {?KeyboardTesterElement} */

chrome/test/data/webui/chromeos/diagnostics/touchscreen_tester_test.js

@@ -8,7 +8,7 @@ import {DialogType, SCREEN_MAX_LENGTH, TouchEventType} from 'chrome://diagnostic
 import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertDeepEquals, assertEquals, assertTrue} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 import {eventToPromise} from '../../test_util.js';
 
 suite('touchscreenTesterTestSuite', function() {

chrome/test/data/webui/chromeos/scanning/loading_page_test.js

@@ -8,7 +8,7 @@ import {AppState} from 'chrome://scanning/scanning_app_types.js';
 import {flushTasks} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertEquals, assertFalse, assertTrue} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 import {isVisible} from '../../test_util.js';
 
 import {FakeMediaQueryList} from './scanning_app_test_utils.js';

chrome/test/data/webui/chromeos/scanning/scan_preview_test.js

@@ -12,7 +12,7 @@ import {ScanningBrowserProxyImpl} from 'chrome://scanning/scanning_browser_proxy
 import {flushTasks, waitAfterNextRender} from 'chrome://webui-test/polymer_test_util.js';
 
 import {assertEquals, assertFalse, assertNotEquals, assertTrue} from '../../chai_assert.js';
-import {MockController} from '../mock_controller.m.js';
+import {MockController} from '../../mock_controller.js';
 import {isVisible} from '../../test_util.js';
 
 import {FakeMediaQueryList} from './scanning_app_test_utils.js';