Move origin_trial_feature mojom into common directory

This CL continues the clean up in crrev.com/c/5925798.

There are now two directories containing origin trial-related
mojoms under third_party/blink/public/mojom:
- origin_trials
- origin_trial_feature

There doesn't seem to be any technical reason for the separation.
Instead, it seems to be coincidental from different teams landing code
at different times (including renames).

To improve cohesion, the intent is to move all the mojoms into one
directory, specifically `origin_trials`. This CL removes the `origin_trial_feature` directory, as the last step.


Change-Id: I815d5e7b9304ecd6e2d3520649bc0764f037ff0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5938988
Reviewed-by: Ahmed Moussa <ahmedmoussa@google.com>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Alex Gough <ajgo@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Jason Chase <chasej@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1373536}

android_webview/browser/DEPS

@@ -127,7 +127,7 @@ include_rules = [
   "+third_party/blink/public/common/user_agent/user_agent_metadata.h",
   "+third_party/blink/public/common/web_preferences/web_preferences.h",
   "+third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h",
-  "+third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h",
+  "+third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h",
   "+third_party/blink/public/mojom/permissions/permission_status.mojom-shared.h",
   "+third_party/blink/public/platform/resource_request_blocked_reason.h",
   "+third_party/crashpad/crashpad/client",

android_webview/browser/network_service/aw_proxying_url_loader_factory.cc

@@ -63,7 +63,7 @@
 #include "services/network/public/mojom/fetch_api.mojom.h"
 #include "services/network/public/mojom/restricted_cookie_manager.mojom.h"
 #include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

chrome/browser/ui/views/media_preview/media_preview_feature.cc

@@ -10,7 +10,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/origin_trials_controller_delegate.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

chrome/browser/ui/views/media_preview/media_preview_feature_unittest.cc

@@ -18,7 +18,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

chrome/browser_exposed_mojom_targets.gni

@@ -279,7 +279,7 @@ browser_exposed_mojom_targets = [
   "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings",
   "//third_party/blink/public/mojom:web_feature_mojo_bindings",
   "//third_party/blink/public/mojom/gpu:gpu",
-  "//third_party/blink/public/mojom/origin_trial_feature:origin_trial_feature",
+  "//third_party/blink/public/mojom/origin_trials:origin_trial_feature",
   "//third_party/blink/public/mojom/origin_trials:origin_trial_state",
   "//third_party/blink/public/mojom/private_network_device:private_network_device",
   "//third_party/blink/public/mojom/quota:quota",

components/origin_trials/browser/DEPS

@@ -13,7 +13,7 @@ include_rules = [
   "+net/base/schemeful_site.h",
 
   "+third_party/blink/public/common/origin_trials",
-  "+third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h",
+  "+third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h",
 ]
 
 specific_include_rules = {

components/origin_trials/browser/origin_trials.h

@@ -19,7 +19,7 @@
 #include "content/public/browser/origin_trial_status_change_details.h"
 #include "content/public/browser/origin_trials_controller_delegate.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 using content::OriginTrialStatusChangeDetails;
 

components/origin_trials/browser/origin_trials_unittest.cc

@@ -17,7 +17,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/common/origin_trials/scoped_test_origin_trial_policy.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

content/browser/origin_trials/critical_origin_trials_throttle_unittest.cc

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "content/browser/origin_trials/critical_origin_trials_throttle.h"
+
 #include <string>
 #include <string_view>
 #include <utility>
@@ -10,7 +12,6 @@
 #include "base/containers/flat_set.h"
 #include "base/memory/scoped_refptr.h"
 #include "base/strings/strcat.h"
-#include "content/browser/origin_trials/critical_origin_trials_throttle.h"
 #include "content/public/browser/origin_trials_controller_delegate.h"
 #include "net/http/http_response_headers.h"
 #include "services/network/public/cpp/resource_request.h"
@@ -19,7 +20,7 @@
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
 #include "third_party/blink/public/common/origin_trials/scoped_test_origin_trial_policy.h"
 #include "third_party/blink/public/mojom/loader/resource_load_info.mojom.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/gurl.h"
 #include "url/origin.h"
 

content/browser/shared_storage/shared_storage_document_service_impl.h

@@ -15,7 +15,7 @@
 #include "content/public/browser/frame_tree_node_id.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage.mojom.h"
 #include "url/origin.h"
 

content/browser/shared_storage/shared_storage_worklet_host.h

@@ -22,7 +22,7 @@
 #include "net/base/schemeful_site.h"
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "third_party/blink/public/common/shared_storage/shared_storage_utils.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage.mojom.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage_worklet_service.mojom.h"
 #include "third_party/blink/public/mojom/use_counter/metrics/web_feature.mojom-forward.h"

content/browser/shared_storage/shared_storage_worklet_host_manager.h

@@ -16,7 +16,7 @@
 #include "content/browser/shared_storage/shared_storage_event_params.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/frame_tree_node_id.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage.mojom.h"
 
 namespace content {

content/public/browser/origin_trials_controller_delegate.h

@@ -12,7 +12,7 @@
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/origin_trial_status_change_details.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "url/origin.h"
 
 namespace content {

mojo/public/tools/mojom/check_stable_mojom_compatibility.py

@@ -83,8 +83,12 @@ def _ValidateDelta(root, delta):
     generated_files_to_skip = {
         ('third_party/blink/public/mojom/runtime_feature_state/'
          'runtime_feature.mojom'),
+        # TODO(chasej@): Remove this entry after CL lands to move to
+        # origin_trials/
         ('third_party/blink/public/mojom/origin_trial_feature/'
          'origin_trial_feature.mojom'),
+        ('third_party/blink/public/mojom/origin_trials/'
+         'origin_trial_feature.mojom'),
     }
 
     ast.import_list.items = [

third_party/blink/common/origin_trials/manual_completion_origin_trial_features.cc

@@ -7,10 +7,9 @@
 // changes to it require review from the origin trials team, listed in the
 // OWNERS file.
 
-#include "third_party/blink/public/common/origin_trials/origin_trials.h"
-
 #include "base/containers/contains.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/common/origin_trials/origin_trials.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 namespace blink::origin_trials {
 

third_party/blink/common/origin_trials/navigation_origin_trial_features.cc

@@ -7,10 +7,9 @@
 // changes to it require review from security reviewers, listed in the
 // SECURITY_OWNERS file.
 
-#include "third_party/blink/public/common/origin_trials/origin_trials.h"
-
 #include "base/containers/contains.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/common/origin_trials/origin_trials.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 namespace blink {
 

third_party/blink/common/origin_trials/trial_token_validator.cc

@@ -19,7 +19,7 @@
 #include "third_party/blink/public/common/origin_trials/origin_trials.h"
 #include "third_party/blink/public/common/origin_trials/trial_token.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_result.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 namespace blink {
 namespace {

third_party/blink/public/common/BUILD.gn

@@ -336,7 +336,7 @@ source_set("headers") {
     "//third_party/blink/public/mojom:mojom_modules_headers",
     "//third_party/blink/public/mojom:mojom_platform_shared",
     "//third_party/blink/public/mojom:web_bluetooth_mojo_bindings_headers",
-    "//third_party/blink/public/mojom/origin_trial_feature",
+    "//third_party/blink/public/mojom/origin_trials:origin_trial_feature",
     "//third_party/liburlpattern",
     "//ui/base/mojom:ui_base_types",
     "//ui/display/mojom",

third_party/blink/public/common/origin_trials/origin_trials.h

@@ -11,7 +11,7 @@
 
 #include "base/containers/span.h"
 #include "third_party/blink/public/common/common_export.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-forward.h"
 
 namespace blink {
 

third_party/blink/public/common/origin_trials/trial_token_validator.h

@@ -16,7 +16,7 @@
 #include "base/time/time.h"
 #include "third_party/blink/public/common/common_export.h"
 #include "third_party/blink/public/common/origin_trials/trial_token.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-forward.h"
 #include "url/origin.h"
 
 namespace net {

third_party/blink/public/mojom/BUILD.gn

@@ -312,7 +312,7 @@ mojom("mojom_platform") {
     "//services/viz/public/mojom",
     "//skia/public/mojom",
     "//third_party/blink/public/mojom/gpu",
-    "//third_party/blink/public/mojom/origin_trial_feature",
+    "//third_party/blink/public/mojom/origin_trials:origin_trial_feature",
     "//third_party/blink/public/mojom/origin_trials:origin_trial_state",
     "//third_party/blink/public/mojom/private_network_device",
     "//third_party/blink/public/mojom/quota",

third_party/blink/public/mojom/origin_trial_feature/BUILD.gn

@@ -1,47 +0,0 @@
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//mojo/public/tools/bindings/mojom.gni")
-import("//third_party/blink/renderer/build/scripts/scripts.gni")
-
-mojom("origin_trial_feature") {
-  sources = [ "$root_gen_dir/third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom" ]
-
-  public_deps = [ "//mojo/public/mojom/base" ]
-
-  parser_deps = [ ":generate_origin_trial_feature" ]
-
-  export_class_attribute = "BLINK_COMMON_EXPORT"
-  export_define = "BLINK_COMMON_IMPLEMENTATION=1"
-  export_header = "third_party/blink/public/common/common_export.h"
-
-  export_class_attribute_blink = "PLATFORM_EXPORT"
-  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
-  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
-
-  generate_java = true
-}
-
-blink_python_runner("generate_origin_trial_feature") {
-  script =
-      "../../../renderer/build/scripts/make_origin_trial_feature_mojom_defs.py"
-
-  args = [
-    rebase_path(
-        "//third_party/blink/renderer/platform/runtime_enabled_features.json5",
-        root_build_dir),
-    "--output_dir",
-    rebase_path(
-        "$root_gen_dir/third_party/blink/public/mojom/origin_trial_feature/",
-        root_build_dir),
-  ]
-
-  inputs = scripts_for_json5_files + [
-             "../../../renderer/build/scripts/make_runtime_features_utilities.py",
-             "../../../renderer/build/scripts/make_runtime_features.py",
-             "../../../renderer/build/scripts/templates/origin_trial_feature.mojom.tmpl",
-             "../../../renderer/platform/runtime_enabled_features.json5",
-           ]
-  outputs = [ "$root_gen_dir/third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom" ]
-}

third_party/blink/public/mojom/origin_trials/BUILD.gn

@@ -3,6 +3,25 @@
 # found in the LICENSE file.
 
 import("//mojo/public/tools/bindings/mojom.gni")
+import("//third_party/blink/renderer/build/scripts/scripts.gni")
+
+mojom("origin_trial_feature") {
+  sources = [ "$root_gen_dir/third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom" ]
+
+  public_deps = [ "//mojo/public/mojom/base" ]
+
+  parser_deps = [ ":generate_origin_trial_feature" ]
+
+  export_class_attribute = "BLINK_COMMON_EXPORT"
+  export_define = "BLINK_COMMON_IMPLEMENTATION=1"
+  export_header = "third_party/blink/public/common/common_export.h"
+
+  export_class_attribute_blink = "PLATFORM_EXPORT"
+  export_define_blink = "BLINK_PLATFORM_IMPLEMENTATION=1"
+  export_header_blink = "third_party/blink/renderer/platform/platform_export.h"
+
+  generate_java = true
+}
 
 mojom("origin_trial_state") {
   sources = [ "origin_trial_state_host.mojom" ]
@@ -23,3 +42,25 @@ mojom("origin_trial_state") {
 
   generate_java = true
 }
+
+blink_python_runner("generate_origin_trial_feature") {
+  script =
+      "../../../renderer/build/scripts/make_origin_trial_feature_mojom_defs.py"
+
+  args = [
+    rebase_path(
+        "//third_party/blink/renderer/platform/runtime_enabled_features.json5",
+        root_build_dir),
+    "--output_dir",
+    rebase_path("$root_gen_dir/third_party/blink/public/mojom/origin_trials/",
+                root_build_dir),
+  ]
+
+  inputs = scripts_for_json5_files + [
+             "../../../renderer/build/scripts/make_runtime_features_utilities.py",
+             "../../../renderer/build/scripts/make_runtime_features.py",
+             "../../../renderer/build/scripts/templates/origin_trial_feature.mojom.tmpl",
+             "../../../renderer/platform/runtime_enabled_features.json5",
+           ]
+  outputs = [ "$root_gen_dir/third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom" ]
+}

third_party/blink/public/mojom/shared_storage/shared_storage.mojom

@@ -8,7 +8,7 @@ import "mojo/public/mojom/base/string16.mojom";
 import "services/network/public/mojom/fetch_api.mojom";
 import "third_party/blink/public/mojom/fenced_frame/fenced_frame_config.mojom";
 import "third_party/blink/public/mojom/messaging/cloneable_message.mojom";
-import "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom";
+import "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom";
 import "url/mojom/origin.mojom";
 import "url/mojom/url.mojom";
 

third_party/blink/public/mojom/worker/worklet_global_scope_creation_params.mojom

@@ -7,7 +7,7 @@ module blink.mojom;
 import "mojo/public/mojom/base/unguessable_token.mojom";
 import "third_party/blink/public/mojom/devtools/devtools_agent.mojom";
 import "third_party/blink/public/mojom/loader/code_cache.mojom";
-import "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom";
+import "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom";
 import "third_party/blink/public/mojom/browser_interface_broker.mojom";
 import "url/mojom/origin.mojom";
 import "url/mojom/url.mojom";

third_party/blink/renderer/bindings/core/v8/worker_or_worklet_script_controller.cc

@@ -34,7 +34,7 @@
 #include <tuple>
 
 #include "base/debug/crash_logging.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-blink.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
 #include "third_party/blink/renderer/core/execution_context/agent.h"

third_party/blink/renderer/bindings/scripts/bind_gen/interface.py

@@ -7179,7 +7179,7 @@ def generate_class_like(class_like,
         # Blink implementation class' header (e.g. node.h for Node)
         (class_like.code_generator_info.blink_headers
          and class_like.code_generator_info.blink_headers[0]),
-        "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h",
+        "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h",
         "third_party/blink/renderer/bindings/core/v8/is_return_type_compatible.h",
     ])
     if interface and interface.inherited:
@@ -7203,7 +7203,7 @@ def generate_class_like(class_like,
         "third_party/blink/renderer/platform/bindings/idl_member_installer.h",
         "third_party/blink/renderer/platform/bindings/runtime_call_stats.h",
         "third_party/blink/renderer/platform/bindings/v8_binding.h",
-        "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h",
+        "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h",
     ])
     impl_source_node.accumulator.add_include_headers(
         _collect_include_headers(class_like))
@@ -7420,7 +7420,7 @@ def generate_install_properties_per_feature(function_name,
         "base/containers/span.h",
         "third_party/blink/renderer/platform/bindings/script_state.h",
         "third_party/blink/renderer/platform/bindings/v8_per_context_data.h",
-        "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h",
+        "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h",
     ])
     source_node.extend([
         make_copyright_header(),

third_party/blink/renderer/build/scripts/templates/origin_trials.cc.tmpl

@@ -14,7 +14,7 @@
 #include "build/build_config.h"
 #include "build/buildflag.h"
 #include "build/chromeos_buildflags.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 // For testing. See OriginTrialsSampleAPIInvalidOS.
 #define BUILDFLAG_INTERNAL_IS_INVALID() (0)

third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.cc.tmpl

@@ -9,7 +9,7 @@
 #include "third_party/blink/renderer/platform/runtime_enabled_features.h"
 
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/renderer/platform/feature_context.h"
 #include "third_party/blink/renderer/platform/runtime_feature_state/runtime_feature_state_override_context.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"

third_party/blink/renderer/build/scripts/templates/runtime_feature_state_override_context.cc.tmpl

@@ -4,7 +4,7 @@
 {{source_files_for_generated_file(template_file, input_files)}}
 
 #include "third_party/blink/public/common/features.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/common/thread_safe_browser_interface_broker_proxy.h"
 #include "third_party/blink/public/mojom/origin_trials/origin_trial_state_host.mojom-blink.h"
 #include "third_party/blink/public/platform/platform.h"

third_party/blink/renderer/build/scripts/templates/runtime_feature_state_override_context.h.tmpl

@@ -8,7 +8,7 @@
 
 #include "base/containers/flat_map.h"
 #include "mojo/public/cpp/bindings/remote.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h"
 #include "third_party/blink/public/mojom/origin_trials/origin_trial_state_host.mojom-blink.h"
 #include "third_party/blink/public/mojom/runtime_feature_state/runtime_feature.mojom-shared.h"
 #include "third_party/blink/renderer/platform/heap/garbage_collected.h"

third_party/blink/renderer/build/scripts/templates/web_origin_trials.cc.tmpl

@@ -7,7 +7,7 @@
 
 #include "third_party/blink/renderer/core/dom/document.h"
 #include "third_party/blink/renderer/core/execution_context/execution_context.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/common/origin_trials/origin_trials.h"
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/web/web_document.h"

third_party/blink/renderer/core/css/properties/css_property_test.cc

@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 #include "third_party/blink/renderer/core/css/properties/css_property.h"
+
 #include <cstring>
+
 #include "base/memory/values_equivalent.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/renderer/core/css/anchor_evaluator.h"
 #include "third_party/blink/renderer/core/css/css_property_names.h"
 #include "third_party/blink/renderer/core/css/css_test_helpers.h"

third_party/blink/renderer/core/loader/document_loader.cc

@@ -65,7 +65,7 @@
 #include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
 #include "third_party/blink/public/mojom/frame/frame.mojom-blink.h"
 #include "third_party/blink/public/mojom/loader/same_document_navigation_type.mojom-shared.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/page/page.mojom-blink.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_fetch_handler_bypass_option.mojom-blink.h"
 #include "third_party/blink/public/mojom/service_worker/service_worker_fetch_handler_type.mojom-blink.h"

third_party/blink/renderer/core/origin_trials/origin_trial_context.cc

@@ -18,7 +18,7 @@
 #include "third_party/blink/public/common/origin_trials/trial_token.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_result.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_security_origin.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_controller.h"

third_party/blink/renderer/core/origin_trials/origin_trial_context_test.cc

@@ -18,7 +18,7 @@
 #include "third_party/blink/public/common/origin_trials/trial_token.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_result.h"
 #include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/permissions_policy/permissions_policy.mojom-blink.h"
 #include "third_party/blink/renderer/core/dom/dom_exception.h"
 #include "third_party/blink/renderer/core/frame/local_dom_window.h"

third_party/blink/renderer/modules/exported/web_shared_storage_worklet_thread_impl.cc

@@ -6,7 +6,7 @@
 
 #include "third_party/blink/public/mojom/browser_interface_broker.mojom.h"
 #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage_worklet_service.mojom-blink.h"
 #include "third_party/blink/public/mojom/worker/worklet_global_scope_creation_params.mojom-blink.h"
 #include "third_party/blink/public/mojom/worker/worklet_global_scope_creation_params.mojom.h"

third_party/blink/renderer/modules/shared_storage/shared_storage_worklet.cc

@@ -12,7 +12,7 @@
 #include "third_party/blink/public/common/features.h"
 #include "third_party/blink/public/common/permissions_policy/permissions_policy.h"
 #include "third_party/blink/public/common/shared_storage/shared_storage_utils.h"
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 #include "third_party/blink/public/mojom/shared_storage/shared_storage.mojom-blink.h"
 #include "third_party/blink/renderer/bindings/core/v8/script_promise_resolver.h"
 #include "third_party/blink/renderer/bindings/core/v8/v8_binding_for_core.h"

third_party/blink/renderer/platform/bindings/origin_trial_features.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ORIGIN_TRIAL_FEATURES_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_ORIGIN_TRIAL_FEATURES_H_
 
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace blink {

third_party/blink/renderer/platform/bindings/v8_interface_bridge_base.cc

@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/platform/bindings/v8_interface_bridge_base.h"
 
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-shared.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-shared.h"
 
 namespace blink {
 namespace bindings {

third_party/blink/renderer/platform/bindings/v8_interface_bridge_base.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_V8_INTERFACE_BRIDGE_BASE_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_BINDINGS_V8_INTERFACE_BRIDGE_BASE_H_
 
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 #include "v8/include/v8-forward.h"

third_party/blink/renderer/platform/feature_context.h

@@ -5,7 +5,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_FEATURE_CONTEXT_H_
 #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_FEATURE_CONTEXT_H_
 
-#include "third_party/blink/public/mojom/origin_trial_feature/origin_trial_feature.mojom-blink-forward.h"
+#include "third_party/blink/public/mojom/origin_trials/origin_trial_feature.mojom-blink-forward.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
 
 namespace blink {