Reland "os settings: move constants mojom to ash dir"

This is a reland of commit 18d33ea

The original CL failed on lacros build with link time symbol issue. It
seems although `:mojom` is in the `public_deps` of `:constants` target,
the linker still could not resolve the symbols, need to explicitly list
`:mojom` as a dependency instead.

Original change's description:
> os settings: move constants mojom to ash dir
>
> AX-Relnotes: n/a
> Bug: b/284187997
> Change-Id: Ibe60e20bc72ea4cc09b0cf5a64a6f4e6dfdf32ca
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4743786
> Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
> Reviewed-by: Wes Okuhara <wesokuhara@google.com>
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Reviewed-by: James Cook <jamescook@chromium.org>
> Owners-Override: Katie Dektar <katie@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1179924}

Bug: b/284187997
Change-Id: Id2fe1759d019d7a45d316dff5c82c26971faa372
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4752724
Reviewed-by: James Cook <jamescook@chromium.org>
Owners-Override: Navin Ramsaroop <ramsaroop@google.com>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Wes Okuhara <wesokuhara@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1182841}

Author: Xiaohui Chen

ash/assistant/util/deep_link_util.cc

@@ -430,10 +430,8 @@ GURL GetChromeSettingsUrl(const absl::optional<std::string>& page) {
   // Browser Settings at some point in the future at which point we will define
   // an analogous collection of |kAllowedBrowserPages|.
   // These values are copied from
-  // chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.
-  // We can not reuse the generated defines as we can not depend on //chrome.
-  // TODO(b/168138594): use generated defines once that header has been moved to
-  // chromeos.
+  // ash/webui/settings/public/constants/routes.mojom.
+  // TODO(b/168138594): use generated defines, now it's ready to use.
   static const std::map<std::string, std::string> kAllowedOsPages = {
       {/*page=*/"googleAssistant", /*os_page=*/"googleAssistant"},
       {/*page=*/"languages", /*os_page=*/"osLanguages/languages"}};

ash/webui/BUILD.gn

@@ -35,6 +35,7 @@ test("ash_webui_unittests") {
     "//ash/webui/projector_app:unit_tests",
     "//ash/webui/scanning:unit_tests",
     "//ash/webui/scanning/mojom:unit_tests",
+    "//ash/webui/settings/public/constants:unit_tests",
     "//ash/webui/shimless_rma/backend:unit_tests",
     "//ash/webui/shimless_rma/mojom:unit_tests",
     "//ash/webui/shortcut_customization_ui:unit_tests",

chrome/browser/ui/webui/settings/chromeos/DIR_METADATA ash/webui/settings/DIR_METADATA

@@ -0,0 +1,61 @@
+# Copyright 2020 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/config/chromeos/ui_mode.gni")
+import("//mojo/public/tools/bindings/mojom.gni")
+
+assert(is_chromeos)
+
+# TODO(http://b/284187997): add assert(is_chromeos_ash) when all browser
+# dependencies are cleaned up.  Also rename the namespace to `ash::settings`.
+
+mojom("mojom") {
+  sources = [
+    "routes.mojom",
+    "setting.mojom",
+  ]
+  webui_module_path = "/"
+  use_typescript_sources = true
+}
+
+action("gen_routes") {
+  script = "gen_routes.py"
+  outputs = [ "$target_gen_dir/routes.h" ]
+  deps = [ ":mojom" ]
+  args = [
+    "--gen_dir",
+    rebase_path(target_gen_dir, root_build_dir),
+  ]
+}
+
+component("constants") {
+  output_name = "ash_webui_settings_public_constants"
+
+  defines = [ "IS_ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_IMPL" ]
+
+  sources = [
+    "routes_util.cc",
+    "routes_util.h",
+  ]
+
+  public_deps = [ ":mojom" ]
+
+  deps = [
+    ":gen_routes",
+    "//base",
+  ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+
+  sources = [ "routes_util_unittest.cc" ]
+
+  deps = [
+    ":constants",
+    "//base",
+    "//content/test:test_support",
+    "//testing/gtest",
+  ]
+}

chrome/browser/ui/webui/settings/chromeos/OWNERS ash/webui/settings/OWNERS

@@ -17,7 +17,7 @@
 import sys
 
 # Path of the <chromium>/src directory.
-CHROMIUM_SRC_PATH = pathlib.Path(__file__).parents[7].resolve(strict=True)
+CHROMIUM_SRC_PATH = pathlib.Path(__file__).parents[5].resolve(strict=True)
 if CHROMIUM_SRC_PATH.name != 'src':
     raise AssertionError(
         f'CHROMIUM_SRC_PATH "{CHROMIUM_SRC_PATH}" should end in "src".')
@@ -51,10 +51,10 @@ def main(args):
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_H_
-#define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_H_
+#ifndef ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_H_
+#define ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_H_
 
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 
 namespace chromeos::settings {{
 
@@ -67,7 +67,7 @@ def main(args):
 
 }  // namespace chromeos::settings
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_H_
+#endif  // ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_H_
 '''
     output_path = os.path.join(parsed_args.gen_dir, 'routes.h')
     with open(output_path, 'w') as f:

ash/webui/settings/public/constants/BUILD.gn

@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_UTIL_H_
-#define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_UTIL_H_
-
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes_util.h"
+#include "ash/webui/settings/public/constants/routes_util.h"
 
 #include <string>
 
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.h"
+#include "ash/webui/settings/public/constants/routes.h"
 
 namespace chromeos::settings {
 
 namespace {
 
 std::string RemoveQuery(std::string path) {
   std::string::size_type input_index = path.find('?');
-  if (input_index != std::string::npos)
+  if (input_index != std::string::npos) {
     path.resize(input_index);
+  }
   return path;
 }
 
@@ -30,13 +28,12 @@ bool IsOSSettingsSubPage(const std::string& sub_page) {
 
   for (const char* p : kPaths) {
     std::string path_without_query = RemoveQuery(p);
-    if (sub_page_without_query == path_without_query)
+    if (sub_page_without_query == path_without_query) {
       return true;
+    }
   }
 
   return false;
 }
 
 }  // namespace chromeos::settings
-
-#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CONSTANTS_ROUTES_UTIL_H_

chrome/browser/ui/webui/settings/chromeos/constants/OWNERS ash/webui/settings/public/constants/OWNERS

@@ -0,0 +1,20 @@
+// Copyright 2020 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_UTIL_H_
+#define ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_UTIL_H_
+
+#include <string>
+
+#include "base/component_export.h"
+
+namespace chromeos::settings {
+
+// Returns true if the sub-page is one defined in `routes.mojom`.
+COMPONENT_EXPORT(ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS)
+bool IsOSSettingsSubPage(const std::string& sub_page);
+
+}  // namespace chromeos::settings
+
+#endif  // ASH_WEBUI_SETTINGS_PUBLIC_CONSTANTS_ROUTES_UTIL_H_

chrome/browser/ui/webui/settings/chromeos/constants/gen_routes.py ash/webui/settings/public/constants/gen_routes.py

@@ -1,7 +1,7 @@
 // Copyright 2022 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes_util.h"
+#include "ash/webui/settings/public/constants/routes_util.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 

chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom ash/webui/settings/public/constants/routes.mojom

@@ -5704,12 +5704,12 @@ static_library("browser") {
     ]
     deps += [
       "//ash/webui/projector_app/public/cpp",
+      "//ash/webui/settings/public/constants",
       "//chrome/browser/chromeos",
       "//chrome/browser/chromeos/drivefs",
       "//chrome/browser/chromeos/extensions/telemetry",
       "//chrome/browser/policy:onc",
       "//chrome/browser/ui/quick_answers",
-      "//chrome/browser/ui/webui/settings/chromeos/constants:mojom",
       "//chrome/browser/webshare:storage",
       "//chrome/common/chromeos/extensions",
       "//chromeos/components/cdm_factory_daemon:cdm_factory_daemon_browser",

chrome/browser/ui/webui/settings/chromeos/constants/routes_util.cc ash/webui/settings/public/constants/routes_util.cc

@@ -14,6 +14,7 @@
 #include "ash/public/cpp/accessibility_focus_ring_info.h"
 #include "ash/public/cpp/event_rewriter_controller.h"
 #include "ash/public/cpp/window_tree_host_lookup.h"
+#include "ash/webui/settings/public/constants/routes_util.h"
 #include "base/containers/contains.h"
 #include "base/functional/bind.h"
 #include "base/json/json_writer.h"
@@ -30,7 +31,6 @@
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes_util.h"
 #include "chrome/common/extensions/api/accessibility_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/webui_url_constants.h"

ash/webui/settings/public/constants/routes_util.h

@@ -140,8 +140,8 @@
 #include "url/url_constants.h"
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
+#include "ash/webui/settings/public/constants/routes.mojom.h"  // nogncheck
 #include "chrome/browser/ash/system_web_apps/system_web_app_manager.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"  // nogncheck
 #endif
 
 #if defined(USE_AURA)

chrome/browser/ui/webui/settings/chromeos/constants/routes_util_unittest.cc ash/webui/settings/public/constants/routes_util_unittest.cc

@@ -3469,6 +3469,7 @@ source_set("ash") {
     "//ash/webui/projector_app",
     "//ash/webui/scanning",
     "//ash/webui/scanning/mojom",
+    "//ash/webui/settings/public/constants",
     "//ash/webui/shimless_rma",
     "//ash/webui/shimless_rma/backend",
     "//ash/webui/shortcut_customization_ui",
@@ -3862,6 +3863,7 @@ source_set("ash") {
     "//ash/webui/resources:scanning_app_resources",
     "//ash/webui/resources:shimless_rma_resources",
     "//ash/webui/resources:shortcut_customization_app_resources",
+    "//ash/webui/settings/public/constants:mojom",
     "//ash/webui/system_apps/public:system_web_app_config",
     "//ash/webui/system_apps/public:system_web_app_type",
     "//build:branding_buildflags",
@@ -3907,7 +3909,6 @@ source_set("ash") {
     "//chrome/browser/ui/ash/system_web_apps",
     "//chrome/browser/ui/webui/ash/cloud_upload:mojo_bindings_shared",
     "//chrome/browser/ui/webui/ash/crostini_upgrader:mojo_bindings",
-    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom",
     "//chrome/browser/webshare:storage",
     "//chrome/common:channel_info",
     "//chrome/common:non_code_constants",
@@ -4878,7 +4879,6 @@ source_set("unit_tests") {
     "../ui/webui/settings/ash/search_engines_handler_unittest.cc",
     "../ui/webui/settings/ash/send_search_feedback_handler_unittest.cc",
     "../ui/webui/settings/ash/settings_user_action_tracker_unittest.cc",
-    "../ui/webui/settings/chromeos/constants/routes_util_unittest.cc",
     "accessibility/pumpkin_installer_unittest.cc",
     "account_manager/account_apps_availability_unittest.cc",
     "account_manager/account_manager_edu_coexistence_controller_unittest.cc",
@@ -5901,6 +5901,7 @@ source_set("unit_tests") {
     "//ash/webui/personalization_app/mojom",
     "//ash/webui/scanning",
     "//ash/webui/scanning/mojom",
+    "//ash/webui/settings/public/constants:mojom",
     "//base",
     "//base:i18n",
     "//base/test:test_config",
@@ -5955,7 +5956,6 @@ source_set("unit_tests") {
     "//chrome/browser/ui/webui/settings/ash/input_device_settings:mojom",
     "//chrome/browser/ui/webui/settings/ash/os_apps_page/mojom",
     "//chrome/browser/ui/webui/settings/ash/search/mojom",
-    "//chrome/browser/ui/webui/settings/chromeos/constants:mojom",
     "//chrome/browser/web_applications",
     "//chrome/browser/web_applications:web_applications_test_support",
     "//chrome/browser/web_applications/mojom:mojom_web_apps_enum",

chrome/browser/ui/webui/settings/chromeos/constants/setting.mojom ash/webui/settings/public/constants/setting.mojom

@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/ash/account_manager/account_manager_ui_impl.h"
+
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/browser/ui/webui/signin/ash/inline_login_dialog.h"
 #include "components/account_manager_core/account_addition_options.h"
 

chrome/browser/BUILD.gn

@@ -14,6 +14,7 @@
 #include "ash/public/cpp/test/shell_test_api.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/shell.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/memory/raw_ptr.h"
@@ -59,7 +60,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"

chrome/browser/accessibility/accessibility_extension_api_chromeos.cc

@@ -10,6 +10,7 @@
 #include <string>
 
 #include "ash/strings/grit/ash_strings.h"
+#include "ash/webui/settings/public/constants/routes.mojom-forward.h"
 #include "base/functional/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/apps/app_service/app_service_proxy.h"
@@ -24,7 +25,6 @@
 #include "chrome/browser/ash/app_list/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/webui/settings/ash/calculator/size_calculator.h"
 #include "chrome/browser/ui/webui/settings/ash/device_storage_util.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom-forward.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/ash/components/string_matching/fuzzy_tokenized_string_match.h"

chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -7,6 +7,7 @@
 #include "ash/constants/ash_switches.h"
 #include "ash/constants/notifier_catalogs.h"
 #include "ash/public/cpp/notification_utils.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "ash/wm/desks/templates/saved_desk_controller.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram_functions.h"
@@ -26,7 +27,6 @@
 #include "chrome/browser/notifications/notification_display_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/browser/web_applications/web_app_utils.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"

chrome/browser/ash/BUILD.gn

@@ -16,6 +16,7 @@
 #include "ash/components/arc/session/arc_management_transition.h"
 #include "ash/components/arc/session/arc_service_manager.h"
 #include "ash/constants/ash_switches.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "base/command_line.h"
 #include "base/containers/flat_set.h"
 #include "base/functional/bind.h"
@@ -40,7 +41,6 @@
 #include "chrome/browser/signin/identity_manager_factory.h"
 #include "chrome/browser/signin/signin_ui_util.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/browser/ui/webui/signin/ash/inline_login_dialog.h"
 #include "chrome/common/webui_url_constants.h"
 #include "components/account_manager_core/account_manager_facade.h"

chrome/browser/ash/account_manager/account_manager_ui_impl.cc

@@ -11,6 +11,7 @@
 #include "ash/components/arc/arc_features.h"
 #include "ash/components/arc/arc_util.h"
 #include "ash/public/cpp/app_types_util.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "base/feature_list.h"
 #include "base/files/file_util.h"
 #include "base/functional/bind.h"
@@ -40,7 +41,6 @@
 #include "chrome/browser/sharesheet/sharesheet_service_factory.h"
 #include "chrome/browser/sharesheet/sharesheet_types.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/browser/webshare/prepare_directory_task.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "components/services/app_service/public/cpp/intent.h"

chrome/browser/ash/app_list/app_list_client_impl_browsertest.cc

@@ -9,6 +9,7 @@
 
 #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h"
 #include "ash/public/cpp/notification_utils.h"
+#include "ash/webui/settings/public/constants/routes.mojom.h"
 #include "base/functional/bind.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/utf_string_conversions.h"
@@ -21,7 +22,6 @@
 #include "chrome/browser/notifications/notification_display_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/settings_window_manager_chromeos.h"
-#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
 #include "chrome/common/webui_url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/user_manager/user_manager.h"