Update from https://crrev.com/327068

build/secondary/tools/grit/grit_rule.gni

 # Copyright 2014 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.
 
 # Instantiate grit. This will produce a script target to run grit, and a
 # static library that compiles the .cc files.
 #
 # Parameters
 #
 #   source (required)
@@ skipping 128 matching lines @@
 if (use_ash) {
   grit_defines += [
     "-D",
     "use_ash",
   ]
 }
 
 if (use_nss_certs) {
   grit_defines += [
     "-D",
-    "use_nss",
+    "use_nss_certs",
   ]
 }
 
 if (use_ozone) {
   grit_defines += [
     "-D",
     "use_ozone",
   ]
 }
 
@@ skipping 37 matching lines @@
     rebase_path("//build/ios/grit_whitelist.txt", root_build_dir),
   ]
 }
 
 if (enable_extensions) {
   grit_defines += [
     "-D",
     "enable_extensions",
   ]
 }
+if (enable_media_router) {
+  grit_defines += [
+    "-D",
+    "enable_media_router",
+  ]
+}
 if (enable_plugins) {
   grit_defines += [
     "-D",
     "enable_plugins",
   ]
 }
 if (enable_basic_printing || enable_print_preview) {
   grit_defines += [
     "-D",
     "enable_printing",
@@ skipping 75 matching lines @@
   ]
 }
 
 grit_resource_id_file = "//tools/gritsettings/resource_ids"
 grit_info_script = "//tools/grit/grit_info.py"
 
 template("grit") {
   assert(defined(invoker.source),
          "\"source\" must be defined for the grit template $target_name")
 
+  grit_inputs = [ invoker.source ]
+
   if (defined(invoker.resource_ids)) {
     resource_ids = invoker.resource_ids
   } else {
     resource_ids = grit_resource_id_file
   }
+  grit_inputs += [ resource_ids ]  # Script depends on ID file.
 
   if (defined(invoker.output_dir)) {
     output_dir = invoker.output_dir
   } else {
     output_dir = target_gen_dir
   }
 
   if (defined(invoker.output_name)) {
     grit_output_name = invoker.output_name
   } else {
     grit_output_name = target_name
   }
 
   # These are all passed as arguments to the script so have to be relative to
   # the build directory.
   if (resource_ids != "") {
     resource_ids = rebase_path(resource_ids, root_build_dir)
   }
   rebased_output_dir = rebase_path(output_dir, root_build_dir)
   source_path = rebase_path(invoker.source, root_build_dir)
 
   if (defined(invoker.grit_flags)) {
     grit_flags = invoker.grit_flags
   } else {
     grit_flags = []  # These are optional so default to empty list.
   }
 
-  grit_inputs = [ invoker.source ]
-
   assert_files_flags = []
 
   # We want to make sure the declared outputs actually match what Grit is
   # writing. We write the list to a file (some of the output lists are long
   # enough to not fit on a Windows command line) and ask Grit to verify those
   # are the actual outputs at runtime.
   asserted_list_file =
       "$target_out_dir/${grit_output_name}_expected_outputs.txt"
   write_file(asserted_list_file,
              rebase_path(invoker.outputs, root_build_dir, output_dir))
@@ skipping 18 matching lines @@
       include_dirs = [ output_dir ]
     }
     visibility = target_visibility
   }
 
   grit_custom_target = target_name + "_grit"
   action(grit_custom_target) {
     script = "//tools/grit/grit.py"
     inputs = grit_inputs
 
-    # TODO(knn): Remove this once grit has rolled to recognize the flag.
-    depend_on_stamp =
-        defined(invoker.depend_on_stamp) && invoker.depend_on_stamp
-    if (depend_on_stamp) {
-      # Need this for migrating existing targets without clobbering.
-      depfile = "$output_dir/${grit_output_name}_stamp.d"
-      outputs = [
-        "${depfile}.stamp",
-      ]
-    } else {
-      depfile = "$output_dir/${grit_output_name}.d"
-      outputs = []
-    }
-    outputs += grit_outputs
+    depfile = "$output_dir/${grit_output_name}_stamp.d"
+    outputs = [ "${depfile}.stamp" ] + grit_outputs
 
     args = [
       "-i",
       source_path,
       "build",
     ]
     if (resource_ids != "") {
       args += [
         "-f",
         resource_ids,
       ]
     }
     args += [
-      "-o",
-      rebased_output_dir,
-      "--depdir",
-      ".",
-      "--depfile",
-      rebase_path(depfile, root_build_dir),
-      "--write-only-new=1",
-    ]
-    if (depend_on_stamp) {
-      args += [ "--depend-on-stamp" ]
-    }
-    args += grit_defines
+              "-o",
+              rebased_output_dir,
+              "--depdir",
+              ".",
+              "--depfile",
+              rebase_path(depfile, root_build_dir),
+              "--write-only-new=1",
+              "--depend-on-stamp",
+            ] + grit_defines
 
     # Add extra defines with -D flags.
     if (defined(invoker.defines)) {
       foreach(i, invoker.defines) {
         args += [
           "-D",
           i,
         ]
       }
     }
@@ skipping 43 matching lines @@
     if (defined(invoker.configs)) {
       configs += invoker.configs
     }
 
     if (defined(invoker.visibility)) {
       visibility = invoker.visibility
     }
     output_name = grit_output_name
   }
 }