Revert of [Service Manager] Get rid of dynamic service discovery

content/BUILD.gn

 # 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.
 
 import("//tools/grit/grit_rule.gni")
 import("//build/config/nacl/config.gni")
 import("//ppapi/features/features.gni")
 
 # Applied by targets internal to content.
 config("content_implementation") {
@@ skipping 100 matching lines @@
 
 grit("resources") {
   source = "content_resources.grd"
   use_qualified_include = true
   outputs = [
     "grit/content_resources.h",
     "content_resources.pak",
   ]
   grit_flags = [
     "-E",
-    "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
+    "root_out_dir=" + rebase_path(root_out_dir, root_build_dir),
   ]
   deps = [
     "//content/public/app:browser_manifest",
     "//content/public/app:gpu_manifest",
     "//content/public/app:plugin_manifest",
     "//content/public/app:renderer_manifest",
     "//content/public/app:utility_manifest",
     "//services/catalog:manifest",
   ]
 }
@@ skipping 16 matching lines @@
     sources = [
       "app/sandbox_helper_win.cc",
       "public/app/sandbox_helper_win.h",
     ]
 
     deps = [
       "//sandbox",
     ]
   }
 }