Move image_orientation.js into image_loader/

This file is only used by image_loader, and its only use in Files App
is for a type parameter in thumbnail_loader.

Bug: b/252618901
Change-Id: Icf87bbb908b9dd54700f26314cecc9f64884d690
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3943282
Reviewed-by: Luciano Pacheco <[email protected]>
Commit-Queue: Austin Tankiang <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1057934}

Author: Austin Tankiang

chrome/browser/ash/file_manager/file_manager_jstest.cc

@@ -12,15 +12,6 @@ class FileManagerJsTest : public FileManagerJsTestBase {
             base::FilePath(FILE_PATH_LITERAL("file_manager"))) {}
 };
 
-// Tests that draw to canvases and test pixels need pixel output turned on.
-class CanvasFileManagerJsTest : public FileManagerJsTest {
- public:
-  void SetUp() override {
-    EnablePixelOutput();
-    FileManagerJsTest::SetUp();
-  }
-};
-
 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, ActionsModelTest) {
   RunTestURL("foreground/js/actions_model_unittest.js");
 }
@@ -183,10 +174,6 @@ IN_PROC_BROWSER_TEST_F(FileManagerJsTest, Grid) {
   RunTestURL("foreground/js/ui/grid_unittest.js");
 }
 
-IN_PROC_BROWSER_TEST_F(CanvasFileManagerJsTest, ImageOrientation) {
-  RunTestURL("foreground/js/metadata/image_orientation_unittest.js");
-}
-
 IN_PROC_BROWSER_TEST_F(FileManagerJsTest, InstallLinuxPackageDialogTest) {
   RunTestURL("foreground/js/ui/install_linux_package_dialog_unittest.js");
 }

chrome/browser/ash/file_manager/image_loader_jstest.cc

@@ -12,6 +12,15 @@ class ImageLoaderJsTest : public FileManagerJsTestBase {
             base::FilePath(FILE_PATH_LITERAL("image_loader"))) {}
 };
 
+// Tests that draw to canvases and test pixels need pixel output turned on.
+class CanvasImageLoaderJsTest : public ImageLoaderJsTest {
+ public:
+  void SetUp() override {
+    EnablePixelOutput();
+    ImageLoaderJsTest::SetUp();
+  }
+};
+
 IN_PROC_BROWSER_TEST_F(ImageLoaderJsTest, ImageLoaderClientTest) {
   RunTestURL("image_loader_client_unittest.js");
 }
@@ -27,3 +36,7 @@ IN_PROC_BROWSER_TEST_F(ImageLoaderJsTest, ImageLoaderTest) {
 IN_PROC_BROWSER_TEST_F(ImageLoaderJsTest, SchedulerTest) {
   RunTestURL("scheduler_unittest.js");
 }
+
+IN_PROC_BROWSER_TEST_F(CanvasImageLoaderJsTest, ImageOrientation) {
+  RunTestURL("image_orientation_unittest.js");
+}

ui/file_manager/BUILD.gn

@@ -263,7 +263,6 @@ generate_grd("build_grd") {
       "file_manager/foreground/js/metadata_dispatcher.rollup.js",
       "file_manager/foreground/js/shared.rollup.js",
 
-      "image_loader/image_orientation.js",
       "image_loader/lru_cache.js",
 
       "file_manager/common/js/file_types_data.js",

ui/file_manager/file_manager/BUILD.gn

@@ -34,7 +34,6 @@ generate_grd("build_static_grdp") {
     "common/js/volume_manager_types.js",
     "common/js/url_constants.js",
     "common/js/xfm.js",
-    "foreground/js/metadata/image_orientation.js",
     "externs/background/file_manager_base.js",
     "externs/entry_location.js",
     "externs/files_app_entry_interfaces.js",

ui/file_manager/file_manager/background/js/BUILD.gn

@@ -63,8 +63,9 @@ js_type_check("closure_compile_jsmodules") {
 
   closure_flags = strict_error_checking_closure_args + [
                     "language_in=ECMASCRIPT_2020",
-                    "js_module_root=./gen/ui",
-                    "js_module_root=" + rebase_path("//ui", root_build_dir),
+                    "js_module_root=./gen/ui/file_manager",
+                    "js_module_root=" +
+                        rebase_path("//ui/file_manager", root_build_dir),
                     "browser_resolver_prefix_replacements=\"chrome://webui-test/=./\"",
                     "hide_warnings_for=third_party/",
                     "browser_resolver_prefix_replacements=\"chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp/=./image_loader/\"",
@@ -508,8 +509,9 @@ js_test_type_check("js_test_type_check") {
 
   closure_flags = strict_error_checking_closure_args + [
                     "language_in=ECMASCRIPT_2020",
-                    "js_module_root=./gen/ui",
-                    "js_module_root=" + rebase_path("//ui", root_build_dir),
+                    "js_module_root=./gen/ui/file_manager",
+                    "js_module_root=" +
+                        rebase_path("//ui/file_manager", root_build_dir),
                     "browser_resolver_prefix_replacements=\"chrome://webui-test/=./\"",
                     "hide_warnings_for=third_party/",
                     "browser_resolver_prefix_replacements=\"chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp/=./image_loader/\"",

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

@@ -1296,8 +1296,8 @@ js_library("task_history") {
 js_library("thumbnail_loader") {
   deps = [
     "//ui/file_manager/file_manager/common/js:file_type",
-    "//ui/file_manager/file_manager/foreground/js/metadata:image_orientation",
     "//ui/file_manager/image_loader:image_loader_client",
+    "//ui/file_manager/image_loader:image_orientation",
     "//ui/file_manager/image_loader:load_image_request",
     "//ui/webui/resources/js:assert",
   ]
@@ -1310,6 +1310,7 @@ js_unittest("thumbnail_loader_unittest") {
     "//ui/file_manager/file_manager/common/js:mock_entry",
     "//ui/file_manager/file_manager/common/js:test_error_reporting",
     "//ui/file_manager/image_loader:image_loader_client",
+    "//ui/file_manager/image_loader:image_orientation",
     "//ui/file_manager/image_loader:load_image_request",
   ]
 }

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

@@ -29,7 +29,6 @@ group("js_modules") {
     ":function_parallel",
     ":function_sequence",
     ":id3_parser",
-    ":image_orientation",
     ":image_parsers",
     ":metadata_cache_item",
     ":metadata_cache_set",
@@ -67,7 +66,6 @@ js_type_check("closure_compile_jsmodules") {
     ":function_parallel",
     ":function_sequence",
     ":id3_parser",
-    ":image_orientation",
     ":image_parsers",
     ":metadata_cache_item",
     ":metadata_cache_set",
@@ -195,16 +193,6 @@ js_library("id3_parser") {
   ]
 }
 
-js_library("image_orientation") {
-}
-
-js_unittest("image_orientation_unittest") {
-  deps = [
-    ":image_orientation",
-    "//chrome/test/data/webui:chai_assert",
-  ]
-}
-
 js_library("image_parsers") {
   deps = [
     ":byte_reader",
@@ -366,7 +354,6 @@ js_test_type_check("js_test_type_check") {
     ":exif_parser_unittest",
     ":external_metadata_provider_unittest",
     ":file_system_metadata_provider_unittest",
-    ":image_orientation_unittest",
     ":metadata_cache_item_unittest",
     ":metadata_cache_set_unittest",
     ":metadata_model_unittest",

ui/file_manager/file_manager/foreground/js/thumbnail_loader.js

@@ -3,13 +3,12 @@
 // found in the LICENSE file.
 
 import {ImageLoaderClient} from 'chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp/image_loader_client.js';
+import {ImageTransformParam} from 'chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp/image_orientation.js';
 import {LoadImageRequest, LoadImageResponse, LoadImageResponseStatus} from 'chrome-extension://pmfjbimdmchhbnneeidfognadeopoehp/load_image_request.js';
 import {assert, assertNotReached} from 'chrome://resources/js/assert.js';
 
 import {FileType} from '../../common/js/file_type.js';
 
-import {ImageTransformParam} from './metadata/image_orientation.js';
-
 /**
  * Loads a thumbnail using provided url. In CANVAS mode, loaded images
  * are attached as <canvas> element, while in IMAGE mode as <img>.

ui/file_manager/file_manager_resources.grd

@@ -33,6 +33,7 @@
         <if expr="optimize_webui">
           <!-- When optimize_webui=false these are included via generate_grd() rule -->
           <include name="IDR_IMAGE_LOADER_IMAGE_LOADER_CLIENT_JS" file="image_loader/image_loader_client.js" type="BINDATA" />
+          <include name="IDR_IMAGE_LOADER_IMAGE_ORIENTATION_JS" file="image_loader/image_orientation.js" type="BINDATA" />
           <include name="IDR_IMAGE_LOADER_LOAD_IMAGE_REQUEST_JS" file="image_loader/load_image_request.js" type="BINDATA" />
         </if>
       </if>

ui/file_manager/file_names.gni

@@ -5,6 +5,7 @@ image_loader_static_js_files = [
   "image_loader/image_loader.js",
   "image_loader/image_loader_client.js",
   "image_loader/image_loader_util.js",
+  "image_loader/image_orientation.js",
   "image_loader/image_request_task.js",
   "image_loader/load_image_request.js",
   "image_loader/piex_loader.js",
@@ -172,7 +173,6 @@ static_js_files = [
   "file_manager/foreground/js/metadata/function_parallel.js",
   "file_manager/foreground/js/metadata/function_sequence.js",
   "file_manager/foreground/js/metadata/id3_parser.js",
-  "file_manager/foreground/js/metadata/image_orientation.js",
   "file_manager/foreground/js/metadata/image_parsers.js",
   "file_manager/foreground/js/metadata/metadata_cache_item.js",
   "file_manager/foreground/js/metadata/metadata_cache_set.js",
@@ -294,10 +294,7 @@ foreach(_t, ts_templates) {
 
 # Generated files are built from the repository and the final JS files is only
 # available in the "gen/" folder.
-image_loader_generated_js_files = [
-  "image_loader/image_orientation.js",
-  "image_loader/lru_cache.js",
-]
+image_loader_generated_js_files = [ "image_loader/lru_cache.js" ]
 
 generated_js_files = [
   # Common:
@@ -367,7 +364,6 @@ unittest_files = [
   "file_manager/foreground/elements/files_xf_elements_unittest.js",
   "file_manager/foreground/elements/files_toast_unittest.js",
   "file_manager/foreground/elements/files_tooltip_unittest.js",
-  "file_manager/foreground/js/metadata/image_orientation_unittest.js",
   "file_manager/foreground/js/metadata/metadata_cache_item_unittest.js",
   "file_manager/foreground/js/metadata/exif_parser_unittest.js",
   "file_manager/foreground/js/metadata/thumbnail_model_unittest.js",
@@ -423,6 +419,7 @@ unittest_files = [
   # Image Loader:
   "image_loader/scheduler_unittest.js",
   "image_loader/image_loader_unittest.js",
+  "image_loader/image_orientation_unittest.js",
   "image_loader/cache_unittest.js",
   "image_loader/image_loader_client_unittest.js",
 ]

ui/file_manager/image_loader/BUILD.gn

@@ -21,6 +21,7 @@ js_type_check("closure_compile_jsmodules") {
     ":cache",
     ":image_loader_client",
     ":image_loader_util",
+    ":image_orientation",
     ":image_request_task",
     ":load_image_request",
     ":piex_loader",
@@ -43,19 +44,10 @@ js_unittest("cache_unittest") {
 
 # TODO(b/199451464): Remove this and dependencies.
 copy("copy_from_filesapp") {
-  sources = [
-    "../file_manager/common/js/lru_cache.js",
-    "../file_manager/foreground/js/metadata/image_orientation.js",
-  ]
+  sources = [ "../file_manager/common/js/lru_cache.js" ]
   outputs = [ "$target_gen_dir/{{source_file_part}}" ]
 }
 
-js_library("image_orientation") {
-  sources =
-      [ "$root_gen_dir/ui/file_manager/image_loader/image_orientation.js" ]
-  extra_deps = [ ":copy_from_filesapp" ]
-}
-
 js_library("lru_cache") {
   sources = [ "$root_gen_dir/ui/file_manager/image_loader/lru_cache.js" ]
   extra_deps = [ ":copy_from_filesapp" ]
@@ -117,6 +109,16 @@ js_unittest("image_loader_client_unittest") {
   ]
 }
 
+js_library("image_orientation") {
+}
+
+js_unittest("image_orientation_unittest") {
+  deps = [
+    ":image_orientation",
+    "//chrome/test/data/webui:chai_assert",
+  ]
+}
+
 js_library("piex_loader") {
   externs_list = [ "//ui/file_manager/file_manager/externs/platform.js" ]
 }
@@ -156,6 +158,7 @@ js_test_type_check("js_test_type_check") {
     ":cache_unittest",
     ":image_loader_client_unittest",
     ":image_loader_unittest",
+    ":image_orientation_unittest",
     ":scheduler_unittest",
   ]