Migrate //ash/content to //ash/webui

Most code in //ash/content is Chrome OS-specific WebUI, so this CL
migrates //ash/content to //ash/webui.

ash_content_unittests is renamed to ash_webui_unittests as well.

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1164001
Change-Id: I773e5b74744df139bc1f4f79a9743b59b3b45c0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2978611
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Owners-Override: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Yeunjoo Choi <ychoi@igalia.com>
Cr-Commit-Position: refs/heads/master@{#895108}

BUILD.gn

@@ -464,8 +464,8 @@ group("gn_all") {
   if (is_chromeos_ash) {
     deps += [
       "//ash:ash_unittests",
-      "//ash/content:ash_content_unittests",
       "//ash/keyboard/ui:keyboard_unittests",
+      "//ash/webui:ash_webui_unittests",
       "//chrome/browser/metrics/perf:profile_provider_unittest",
       "//chrome/test:usage_time_limit_unittests",
       "//chromeos/components:chromeos_components_unittests",
@@ -1467,7 +1467,7 @@ if (enable_js_type_check) {
     ]
     if (is_chromeos_ash) {
       data_deps += [
-        "ash/content:closure_compile",
+        "ash/webui:closure_compile",
         "chromeos/components:closure_compile",
         "ui/file_manager:closure_compile",
       ]

WATCHLISTS

@@ -1006,7 +1006,7 @@
                   'chrome/test/data/extensions/api_test/file_system_provider|' \
                   'components/drive|' \
                   'google_apis/drive|' \
-                  'ash/content/file_manager|' \
+                  'ash/webui/file_manager|' \
                   'ui/file_manager'
     },
     'freetype_update': {
@@ -1639,7 +1639,7 @@
                   '|components/metrics/public/mojom/call_stack*',
     },
     'scanning': {
-      'filepath': 'ash/content/scanning/'\
+      'filepath': 'ash/webui/scanning/'\
                   '|chrome/browser/ash/scanning/',
     },
     'security': {

ash/DEPS

@@ -46,7 +46,7 @@ include_rules = [
   "+ui",
   "-ash/host",
 
-  # Ash sits above content. Exceptions live in //ash/content.
+  # Ash sits above content. Exceptions live in //ash/webui.
   "-content",
 
   # Only allow Chrome OS services and D-Bus clients accessible to the mustash

ash/components/resources/BUILD.gn

@@ -10,11 +10,11 @@ assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
 grit("os_feedback_resources") {
   # These arguments are needed since the grd is generated at build time.
   enable_input_discovery_for_gn_analyze = false
-  os_feedback_gen_dir = "$root_gen_dir/ash/content/os_feedback_ui/resources"
+  os_feedback_gen_dir = "$root_gen_dir/ash/webui/os_feedback_ui/resources"
   source = "$os_feedback_gen_dir/ash_os_feedback_resources.grd"
   deps = [
-    "//ash/content/os_feedback_ui/resources:build_grd",
-    "//ash/content/os_feedback_ui/resources:web_components",
+    "//ash/webui/os_feedback_ui/resources:build_grd",
+    "//ash/webui/os_feedback_ui/resources:web_components",
   ]
 
   outputs = [
@@ -27,11 +27,11 @@ grit("os_feedback_resources") {
 }
 
 grit("scanning_app_resources") {
-  source = "../../content/scanning/resources/scanning_app_resources.grd"
+  source = "//ash/webui/scanning/resources/scanning_app_resources.grd"
 
   deps = [
-    "../../content/scanning/mojom:mojom_js",
-    "../../content/scanning/resources:web_components",
+    "//ash/webui/scanning/mojom:mojom_js",
+    "//ash/webui/scanning/resources:web_components",
   ]
 
   outputs = [
@@ -47,10 +47,10 @@ grit("scanning_app_resources") {
 grit("shortcut_customization_app_resources") {
   enable_input_discovery_for_gn_analyze = false
   shortcut_customization_app_gen_dir =
-      "$root_gen_dir/ash/content/shortcut_customization_ui/resources"
+      "$root_gen_dir/ash/webui/shortcut_customization_ui/resources"
   source = "$shortcut_customization_app_gen_dir/ash_shortcut_customization_app_resources.grd"
 
-  deps = [ "../../content/shortcut_customization_ui/resources:build_grd" ]
+  deps = [ "//ash/webui/shortcut_customization_ui/resources:build_grd" ]
 
   outputs = [
     "grit/ash_shortcut_customization_app_resources.h",
@@ -66,10 +66,10 @@ grit("shortcut_customization_app_resources") {
 grit("shimless_rma_resources") {
   enable_input_discovery_for_gn_analyze = false
   shimless_rma_resource_gen_dir =
-      "$root_gen_dir/ash/content/shimless_rma/resources"
+      "$root_gen_dir/ash/webui/shimless_rma/resources"
   source = "$shimless_rma_resource_gen_dir/ash_shimless_rma_resources.grd"
 
-  deps = [ "../../content/shimless_rma/resources:build_grd" ]
+  deps = [ "//ash/webui/shimless_rma/resources:build_grd" ]
 
   outputs = [
     "grit/ash_shimless_rma_resources.h",

ash/content/ash_content_test_suite.h

@@ -1,25 +0,0 @@
-// Copyright 2021 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.
-
-#ifndef ASH_CONTENT_ASH_CONTENT_TEST_SUITE_H_
-#define ASH_CONTENT_ASH_CONTENT_TEST_SUITE_H_
-
-#include "base/test/test_suite.h"
-
-class AshContentTestSuite : public base::TestSuite {
- public:
-  AshContentTestSuite(int argc, char** argv);
-
-  AshContentTestSuite(const AshContentTestSuite&) = delete;
-  AshContentTestSuite& operator=(const AshContentTestSuite&) = delete;
-
-  ~AshContentTestSuite() override;
-
- protected:
-  // base::TestSuite:
-  void Initialize() override;
-  void Shutdown() override;
-};
-
-#endif  // ASH_CONTENT_ASH_CONTENT_TEST_SUITE_H_

ash/webui/BUILD.gn

@@ -9,18 +9,18 @@ assert(is_chromeos_ash, "Non-ChromeOS builds cannot depend on //ash")
 
 # To add a unit test to this target, make a "unit_test" source_set in your
 # component and add a reference here.
-test("ash_content_unittests") {
+test("ash_webui_unittests") {
   sources = [
-    "ash_content_test_suite.cc",
-    "ash_content_test_suite.h",
+    "ash_webui_test_suite.cc",
+    "ash_webui_test_suite.h",
     "run_all_unittests.cc",
   ]
 
   deps = [
-    "//ash/content/scanning:unit_tests",
-    "//ash/content/shimless_rma/backend:unit_tests",
-    "//ash/content/shimless_rma/mojom:unit_tests",
-    "//ash/content/shortcut_customization_ui/backend:unit_tests",
+    "//ash/webui/scanning:unit_tests",
+    "//ash/webui/shimless_rma/backend:unit_tests",
+    "//ash/webui/shimless_rma/mojom:unit_tests",
+    "//ash/webui/shortcut_customization_ui/backend:unit_tests",
     "//base",
     "//base/test:test_support",
     "//build:chromeos_buildflags",
@@ -38,13 +38,13 @@ test("ash_content_unittests") {
 group("closure_compile") {
   testonly = true
   deps = [
-    "//ash/content/os_feedback_ui:closure_compile",
-    "//ash/content/scanning:closure_compile",
-    "//ash/content/shimless_rma:closure_compile",
-    "//ash/content/shortcut_customization_ui:closure_compile",
+    "//ash/webui/os_feedback_ui:closure_compile",
+    "//ash/webui/scanning:closure_compile",
+    "//ash/webui/shimless_rma:closure_compile",
+    "//ash/webui/shortcut_customization_ui:closure_compile",
   ]
 
   if (!is_official_build) {
-    deps += [ "//ash/content/file_manager/resources:closure_compile" ]
+    deps += [ "//ash/webui/file_manager/resources:closure_compile" ]
   }
 }

ash/webui/README.md

@@ -1,7 +1,7 @@
-# //ash/content
+# //ash/webui
 
-//ash/content contains code that has dependencies on //content. Most code
-here is Chrome OS-specific WebUI for system web apps.
+//ash/webui contains code that is Chrome OS-specific WebUI for system web
+apps and has dependencies on //content.
 
 General purpose window manager or system UI code should not have content
 dependencies, and should not live in this directory. Prefer a different
@@ -17,6 +17,6 @@ Lacros is running. Most of its subdirectories used to live in
 //chromeos/components. See the [Lacros documentation][2] or the Lacros
 [directory migration design][3].
 
-[1]: /ash/content/BUILD.gn
+[1]: /ash/webui/BUILD.gn
 [2]: /docs/lacros.md
 [3]: https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE/edit#heading=h.5aq0kntd3afh

ash/webui/ash_webui_test_suite.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/ash_content_test_suite.h"
+#include "ash/webui/ash_webui_test_suite.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
@@ -36,18 +36,18 @@ void InitI18n() {
 
 }  // namespace
 
-AshContentTestSuite::AshContentTestSuite(int argc, char** argv)
+AshWebUITestSuite::AshWebUITestSuite(int argc, char** argv)
     : TestSuite(argc, argv) {}
 
-AshContentTestSuite::~AshContentTestSuite() = default;
+AshWebUITestSuite::~AshWebUITestSuite() = default;
 
-void AshContentTestSuite::Initialize() {
+void AshWebUITestSuite::Initialize() {
   base::TestSuite::Initialize();
 
   InitI18n();
 }
 
-void AshContentTestSuite::Shutdown() {
+void AshWebUITestSuite::Shutdown() {
   ui::ResourceBundle::CleanupSharedInstance();
   base::TestSuite::Shutdown();
 }

ash/webui/ash_webui_test_suite.h

@@ -0,0 +1,25 @@
+// Copyright 2021 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.
+
+#ifndef ASH_WEBUI_ASH_WEBUI_TEST_SUITE_H_
+#define ASH_WEBUI_ASH_WEBUI_TEST_SUITE_H_
+
+#include "base/test/test_suite.h"
+
+class AshWebUITestSuite : public base::TestSuite {
+ public:
+  AshWebUITestSuite(int argc, char** argv);
+
+  AshWebUITestSuite(const AshWebUITestSuite&) = delete;
+  AshWebUITestSuite& operator=(const AshWebUITestSuite&) = delete;
+
+  ~AshWebUITestSuite() override;
+
+ protected:
+  // base::TestSuite:
+  void Initialize() override;
+  void Shutdown() override;
+};
+
+#endif  // ASH_WEBUI_ASH_WEBUI_TEST_SUITE_H_

ash/webui/file_manager/BUILD.gn

@@ -25,8 +25,8 @@ static_library("file_manager_ui") {
 
   deps = [
     ":constants",
-    "//ash/content/file_manager/mojom",
-    "//ash/content/file_manager/resources:file_manager_swa_resources",
+    "//ash/webui/file_manager/mojom",
+    "//ash/webui/file_manager/resources:file_manager_swa_resources",
     "//base",
     "//content/public/browser",
     "//ui/file_manager:file_manager_gen_resources",

ash/webui/file_manager/file_manager_page_handler.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/file_manager/file_manager_page_handler.h"
+#include "ash/webui/file_manager/file_manager_page_handler.h"
 
-#include "ash/content/file_manager/file_manager_ui.h"
+#include "ash/webui/file_manager/file_manager_ui.h"
 
 namespace ash {
 namespace file_manager {

ash/webui/file_manager/file_manager_page_handler.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_
-#define ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_
+#ifndef ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_
+#define ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_
 
-#include "ash/content/file_manager/mojom/file_manager.mojom.h"
+#include "ash/webui/file_manager/mojom/file_manager.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
@@ -37,4 +37,4 @@ class FileManagerPageHandler : public mojom::PageHandler {
 }  // namespace file_manager
 }  // namespace ash
 
-#endif  // ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_
+#endif  // ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_PAGE_HANDLER_H_

ash/webui/file_manager/file_manager_ui.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/file_manager/file_manager_ui.h"
+#include "ash/webui/file_manager/file_manager_ui.h"
 
-#include "ash/content/file_manager/file_manager_page_handler.h"
-#include "ash/content/file_manager/resources/grit/file_manager_swa_resources.h"
-#include "ash/content/file_manager/resources/grit/file_manager_swa_resources_map.h"
-#include "ash/content/file_manager/url_constants.h"
+#include "ash/webui/file_manager/file_manager_page_handler.h"
+#include "ash/webui/file_manager/resources/grit/file_manager_swa_resources.h"
+#include "ash/webui/file_manager/resources/grit/file_manager_swa_resources_map.h"
+#include "ash/webui/file_manager/url_constants.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/web_contents.h"

ash/webui/file_manager/file_manager_ui.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_H_
-#define ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_H_
+#ifndef ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_H_
+#define ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_H_
 
 #include <memory>
 
-#include "ash/content/file_manager/file_manager_ui_delegate.h"
-#include "ash/content/file_manager/mojom/file_manager.mojom.h"
+#include "ash/webui/file_manager/file_manager_ui_delegate.h"
+#include "ash/webui/file_manager/mojom/file_manager.mojom.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -56,4 +56,4 @@ class FileManagerUI : public ui::MojoWebUIController,
 }  // namespace file_manager
 }  // namespace ash
 
-#endif  // ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_H_
+#endif  // ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_H_

ash/webui/file_manager/file_manager_ui_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_
-#define ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_
+#ifndef ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_
+#define ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_
 
 namespace content {
 class WebUIDataSource;
@@ -18,4 +18,4 @@ class FileManagerUIDelegate {
   virtual void PopulateLoadTimeData(content::WebUIDataSource*) const = 0;
 };
 
-#endif  // ASH_CONTENT_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_
+#endif  // ASH_WEBUI_FILE_MANAGER_FILE_MANAGER_UI_DELEGATE_H_

ash/webui/file_manager/resources/BUILD.gn

@@ -10,7 +10,7 @@ import("//tools/grit/preprocess_if_expr.gni")
 import("//ui/webui/resources/tools/generate_grd.gni")
 
 preprocess_folder = "$target_gen_dir/preprocessed"
-mojom_webui_folder = "$root_gen_dir/mojom-webui/ash/content/file_manager/mojom"
+mojom_webui_folder = "$root_gen_dir/mojom-webui/ash/webui/file_manager/mojom"
 
 js_library("crt0") {
 }
@@ -36,7 +36,7 @@ js_library("main_js") {
     "main.js",
     "script_loader.js",
   ]
-  deps = [ "//ash/content/file_manager/mojom:mojom_webui_js" ]
+  deps = [ "//ash/webui/file_manager/mojom:mojom_webui_js" ]
 }
 
 files_app_path =
@@ -60,7 +60,7 @@ js_type_check("closure_compile") {
 action("gen_main_html") {
   inputs = [ "//ui/file_manager/file_manager/main.html" ]
 
-  script = "//ash/content/file_manager/resources/gen_main_html.py"
+  script = "//ash/webui/file_manager/resources/gen_main_html.py"
 
   args = [
     "--source",
@@ -102,7 +102,7 @@ preprocess_if_expr("preprocess_mojo") {
   in_files = [ "file_manager.mojom-webui.js" ]
   out_folder = preprocess_folder
   out_manifest = "$target_gen_dir/manifest_preprocess_mojo.json"
-  deps = [ "//ash/content/file_manager/mojom:mojom_webui_js" ]
+  deps = [ "//ash/webui/file_manager/mojom:mojom_webui_js" ]
 }
 
 optimize_webui("build") {

ash/webui/file_manager/url_constants.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/file_manager/url_constants.h"
+#include "ash/webui/file_manager/url_constants.h"
 
 namespace ash {
 namespace file_manager {

ash/webui/file_manager/url_constants.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_FILE_MANAGER_URL_CONSTANTS_H_
-#define ASH_CONTENT_FILE_MANAGER_URL_CONSTANTS_H_
+#ifndef ASH_WEBUI_FILE_MANAGER_URL_CONSTANTS_H_
+#define ASH_WEBUI_FILE_MANAGER_URL_CONSTANTS_H_
 
 namespace ash {
 namespace file_manager {
@@ -14,4 +14,4 @@ extern const char kChromeUIFileManagerURL[];
 }  // namespace file_manager
 }  // namespace ash
 
-#endif  // ASH_CONTENT_FILE_MANAGER_URL_CONSTANTS_H_
+#endif  // ASH_WEBUI_FILE_MANAGER_URL_CONSTANTS_H_

ash/webui/os_feedback_ui/os_feedback_ui.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/os_feedback_ui/os_feedback_ui.h"
+#include "ash/webui/os_feedback_ui/os_feedback_ui.h"
 
-#include "ash/content/os_feedback_ui/url_constants.h"
 #include "ash/grit/ash_os_feedback_resources.h"
 #include "ash/grit/ash_os_feedback_resources_map.h"
+#include "ash/webui/os_feedback_ui/url_constants.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"

ash/webui/os_feedback_ui/os_feedback_ui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_
-#define ASH_CONTENT_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_
+#ifndef ASH_WEBUI_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_
+#define ASH_WEBUI_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_
 
 #include "ui/webui/mojo_web_ui_controller.h"
 
@@ -23,4 +23,4 @@ class OSFeedbackUI : public ui::MojoWebUIController {
 
 }  // namespace ash
 
-#endif  // ASH_CONTENT_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_
+#endif  // ASH_WEBUI_OS_FEEDBACK_UI_OS_FEEDBACK_UI_H_

ash/webui/os_feedback_ui/url_constants.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/os_feedback_ui/url_constants.h"
+#include "ash/webui/os_feedback_ui/url_constants.h"
 
 namespace ash {
 

ash/webui/os_feedback_ui/url_constants.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_CONTENT_OS_FEEDBACK_UI_URL_CONSTANTS_H_
-#define ASH_CONTENT_OS_FEEDBACK_UI_URL_CONSTANTS_H_
+#ifndef ASH_WEBUI_OS_FEEDBACK_UI_URL_CONSTANTS_H_
+#define ASH_WEBUI_OS_FEEDBACK_UI_URL_CONSTANTS_H_
 
 namespace ash {
 
@@ -12,4 +12,4 @@ extern const char kChromeUIOSFeedbackUrl[];
 
 }  // namespace ash
 
-#endif  // ASH_CONTENT_OS_FEEDBACK_UI_URL_CONSTANTS_H_
+#endif  // ASH_WEBUI_OS_FEEDBACK_UI_URL_CONSTANTS_H_

ash/webui/run_all_unittests.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/content/ash_content_test_suite.h"
+#include "ash/webui/ash_webui_test_suite.h"
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
@@ -14,8 +14,8 @@
 #endif
 
 int main(int argc, char** argv) {
-  AshContentTestSuite test_suite(argc, argv);
+  AshWebUITestSuite test_suite(argc, argv);
   return base::LaunchUnitTests(
       argc, argv,
-      base::BindOnce(&AshContentTestSuite::Run, base::Unretained(&test_suite)));
+      base::BindOnce(&AshWebUITestSuite::Run, base::Unretained(&test_suite)));
 }

ash/webui/scanning/BUILD.gn

@@ -24,7 +24,7 @@ static_library("scanning") {
   deps = [
     "//ash/components/resources:scanning_app_resources",
     "//ash/constants",
-    "//ash/content/scanning/mojom",
+    "//ash/webui/scanning/mojom",
     "//chromeos/strings/",
     "//content/public/browser",
     "//ui/base",

ash/webui/scanning/DEPS

@@ -1,5 +1,4 @@
 include_rules = [
-  "+ash/constants",
   "+ash/grit/ash_scanning_app_resources.h",
   "+ash/grit/ash_scanning_app_resources_map.h",
   "+chromeos/strings/grit/chromeos_strings.h",

ash/webui/scanning/resources/BUILD.gn

@@ -33,7 +33,7 @@ js_library("color_mode_select") {
   deps = [
     ":scanning_app_util",
     ":select_behavior",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -48,7 +48,7 @@ js_library("loading_page") {
 
 js_library("file_type_select") {
   deps = [
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -58,7 +58,7 @@ js_library("page_size_select") {
   deps = [
     ":scanning_app_util",
     ":select_behavior",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -67,7 +67,7 @@ js_library("page_size_select") {
 js_library("resolution_select") {
   deps = [
     ":select_behavior",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -85,7 +85,7 @@ js_library("scan_preview") {
   deps = [
     ":scanning_app_types",
     ":scanning_app_util",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -93,7 +93,7 @@ js_library("scan_preview") {
 
 js_library("scan_to_select") {
   deps = [
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -103,7 +103,7 @@ js_library("scanner_select") {
   deps = [
     ":scanning_app_types",
     ":scanning_app_util",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -144,7 +144,7 @@ js_library("source_select") {
   deps = [
     ":scanning_app_util",
     ":select_behavior",
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/js:i18n_behavior.m",
   ]
@@ -156,7 +156,7 @@ js_library("scanning_browser_proxy") {
 
 js_library("mojo_interface_provider") {
   deps = [
-    "//ash/content/scanning/mojom:mojom_js_library_for_compile",
+    "//ash/webui/scanning/mojom:mojom_js_library_for_compile",
     "//ui/webui/resources/js:cr.m",
   ]
 }