Files app: Generate JS module for remaining files in metadata and base

Files:
- //u/f/base/error_counter.js
- //u/f/f/f/j/metadata/mock_metadata.js
- //u/f/f/f/j/metadata/thumbnail_model.js
- //u/f/f/f/j/metadata/thumbnail_model_unittest.js

Bug: 1133186
Change-Id: If544f64be1ae9f2c8ba69189fc0345a8ee57d99d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2583594
Auto-Submit: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Jeremie Boulic <jboulic@chromium.org>
Commit-Queue: Jeremie Boulic <jboulic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#836010}

chrome/browser/chromeos/file_manager/file_manager_jstest.cc

@@ -242,7 +242,7 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailLoader) {
 }
 
 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ThumbnailModel) {
-  RunTestURL("foreground/js/metadata/thumbnail_model_unittest_gen.html");
+  RunTestURL("foreground/js/metadata/thumbnail_model_unittest.m_gen.html");
 }
 
 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, Trash) {

ui/file_manager/BUILD.gn

@@ -64,7 +64,6 @@ group("unit_test_data") {
     "file_manager/foreground/elements:js_test_gen_html_modules",
     "file_manager/foreground/js:js_test_gen_html",
     "file_manager/foreground/js:js_test_gen_html_modules",
-    "file_manager/foreground/js/metadata:js_test_gen_html",
     "file_manager/foreground/js/metadata:js_test_gen_html_modules",
     "file_manager/foreground/js/ui:js_test_gen_html",
     "gallery/js:js_test_gen_html",

ui/file_manager/base/js/BUILD.gn

@@ -25,6 +25,7 @@ js_type_check("closure_compile_jsmodules") {
   uses_js_modules = true
   deps = [
     ":app_util.m",
+    ":error_counter.m",
     ":filtered_volume_manager.m",
     ":volume_manager_types.m",
   ]
@@ -86,6 +87,12 @@ js_library("app_util.m") {
 js_library("error_counter") {
 }
 
+js_library("error_counter.m") {
+  sources = [ "$root_gen_dir/ui/file_manager/base/js/error_counter.m.js" ]
+
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("filtered_volume_manager") {
   deps = [
     "//ui/file_manager/base/js:volume_manager_types",
@@ -200,6 +207,7 @@ js_modulizer("modulize") {
     "mock_chrome.js",
     "test_error_reporting.js",
     "volume_manager_types.js",
+    "error_counter.js",
   ]
 
   namespace_rewrites = cr_namespace_rewrites

ui/file_manager/base/js/error_counter.js

@@ -5,7 +5,7 @@
 
 (function() {
 
-'use strict';
+/* #ignore */ 'use strict';
 
 /**
  * This variable is checked in several integration and unit tests, to make sure

ui/file_manager/file_manager/foreground/js/metadata/BUILD.gn

@@ -17,7 +17,6 @@ group("closure_compile") {
     ":closure_compile_jsmodules",
     ":closure_compile_module",
     ":js_test_gen_html_modules_type_check_auto",
-    ":js_test_gen_html_type_check_auto",
   ]
 }
 
@@ -43,8 +42,10 @@ js_type_check("closure_compile_jsmodules") {
     ":metadata_parser.m",
     ":metadata_provider.m",
     ":metadata_request.m",
+    ":mock_metadata.m",
     ":mpeg_parser.m",
     ":multi_metadata_provider.m",
+    ":thumbnail_model.m",
   ]
 }
 
@@ -467,6 +468,13 @@ js_library("mock_metadata") {
   deps = [ ":metadata_model" ]
 }
 
+js_library("mock_metadata.m") {
+  sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/metadata/mock_metadata.m.js" ]
+  deps = [ ":metadata_model.m" ]
+
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("mpeg_parser") {
   deps = [ ":metadata_parser" ]
 }
@@ -527,11 +535,23 @@ js_library("thumbnail_model") {
   deps = [ ":metadata_model" ]
 }
 
-js_unittest("thumbnail_model_unittest") {
+js_library("thumbnail_model.m") {
+  sources = [ "$root_gen_dir/ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model.m.js" ]
   deps = [
-    ":thumbnail_model",
-    "//ui/file_manager/base/js:test_error_reporting",
-    "//ui/webui/resources/js:webui_resource_test",
+    ":metadata_model.m",
+    "//ui/file_manager/file_manager/common/js:file_type.m",
+  ]
+
+  extra_deps = [ ":modulize" ]
+}
+
+js_unittest("thumbnail_model_unittest.m") {
+  deps = [
+    ":metadata_item.m",
+    ":metadata_model.m",
+    ":thumbnail_model.m",
+    "//chrome/test/data/webui:chai_assert",
+    "//ui/file_manager/base/js:test_error_reporting.m",
   ]
 }
 
@@ -546,6 +566,7 @@ js_test_gen_html("js_test_gen_html_modules") {
     ":metadata_cache_set_unittest.m",
     ":metadata_model_unittest.m",
     ":multi_metadata_provider_unittest.m",
+    ":thumbnail_model_unittest.m",
   ]
   js_module = true
 
@@ -558,11 +579,6 @@ js_test_gen_html("js_test_gen_html_modules") {
       ]
 }
 
-js_test_gen_html("js_test_gen_html") {
-  deps = [ ":thumbnail_model_unittest" ]
-  mocks = [ "metadata_dispatcher_mock_deps.js" ]
-}
-
 js_modulizer("modulize") {
   input_files = [
     "byte_reader.js",
@@ -586,6 +602,8 @@ js_modulizer("modulize") {
     "metadata_provider.js",
     "mpeg_parser.js",
     "multi_metadata_provider.js",
+    "mock_metadata.js",
+    "thumbnail_model.js",
   ]
 
   namespace_rewrites = cr_namespace_rewrites

ui/file_manager/file_manager/foreground/js/metadata/mock_metadata.js

@@ -2,13 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// #import {MetadataModel} from './metadata_model.m.js';
+
 /**
  * Returns a mock of metadata model.
  *
  * @extends {MetadataModel}
  * @final
  */
-class MockMetadataModel {
+/* #export */ class MockMetadataModel {
   /** @param {Object} initial_properties */
   constructor(initial_properties) {
     /**

ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model.js

@@ -2,13 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// #import {MetadataModel} from './metadata_model.m.js';
+// #import {FileType} from '../../../common/js/file_type.m.js';
+
 /**
  * Metadata containing thumbnail information.
  * @typedef {Object}
  */
 let ThumbnailMetadataItem;
 
-class ThumbnailModel {
+/* #export */ class ThumbnailModel {
   /**
    * @param {!MetadataModel} metadataModel
    */

ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.js → ui/file_manager/file_manager/foreground/js/metadata/thumbnail_model_unittest.m.js

@@ -2,6 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import {assertEquals, assertFalse, assertTrue} from 'chrome://test/chai_assert.js';
+
+import {reportPromise} from '../../../../base/js/test_error_reporting.m.js';
+
+import {MetadataItem} from './metadata_item.m.js';
+import {MetadataModel} from './metadata_model.m.js';
+import {ThumbnailModel} from './thumbnail_model.m.js';
+
 const imageEntry = {
   name: 'image.jpg',
   toURL: function() {
@@ -32,7 +40,7 @@ let metadata;
 let contentMetadata;
 let thumbnailModel;
 
-function setUp() {
+export function setUp() {
   metadata = new MetadataItem();
   metadata.modificationTime = new Date(2015, 0, 1);
   metadata.present = true;
@@ -54,7 +62,7 @@ function setUp() {
   }));
 }
 
-function testThumbnailModelGetBasic(callback) {
+export function testThumbnailModelGetBasic(callback) {
   reportPromise(
       thumbnailModel.get([imageEntry]).then(results => {
         assertEquals(1, results.length);
@@ -72,7 +80,7 @@ function testThumbnailModelGetBasic(callback) {
       callback);
 }
 
-function testThumbnailModelGetNotPresent(callback) {
+export function testThumbnailModelGetNotPresent(callback) {
   metadata.present = false;
   reportPromise(
       thumbnailModel.get([imageEntry]).then(results => {
@@ -91,7 +99,7 @@ function testThumbnailModelGetNotPresent(callback) {
       callback);
 }
 
-function testThumbnailModelGetNonImage(callback) {
+export function testThumbnailModelGetNonImage(callback) {
   reportPromise(
       thumbnailModel.get([nonImageEntry]).then(results => {
         assertEquals(1, results.length);