Make mojom targets depend on chromium mojo environment

third_party/mojo/src/mojo/public/tools/bindings/mojom.gni

Index: third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
diff --git a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
index b72e96a8a2837d80c6a7d4dfaf303077229392d9..1a9873a40aaea9e8575539cd916ea95ed3416ae5 100644
--- a/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
+++ b/third_party/mojo/src/mojo/public/tools/bindings/mojom.gni
@@ -38,6 +38,11 @@ import("../../mojo_sdk.gni")
 #   import_dirs (optional)
 #       List of import directories that will get added when processing sources.
 #
+#   with_environment (optional)
+#       Set to |false| to omit an implicit bindings dependency on the Chromium
+#       Mojo environment implementation. Defaults to |true| and in general
+#       should only be overridden by mojom targets within the Mojo EDK.
+#
 #   testonly (optional)
 #
 #   visibility (optional)
@@ -151,8 +156,8 @@ template("mojom") {
       script = generator_script
       inputs = generator_sources
       sources = invoker.sources
-      outputs = generator_cpp_outputs + generator_java_outputs +
-                generator_js_outputs
+      outputs =
+          generator_cpp_outputs + generator_java_outputs + generator_js_outputs
       args = [
         "{{source}}",
         "--use_bundled_pylibs",
@@ -266,6 +271,9 @@ template("mojom") {
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_${cpp_sources_suffix}" ]
       }
+      if (!defined(invoker.with_environment) || invoker.with_environment) {
+        deps += [ "//mojo/environment:chromium" ]
+      }
     }
   }