Revert of Add a GN flag for the Windows multi-dll build.

chrome/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("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/version.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 if (!is_android) {
   # TODO(GYP) for Windows need to the the reorder-imports step which probably
   # means adding another target and renaming this to chrome_initial like in GYP.
   executable("chrome") {
     # Because the sources list varies so significantly per-platform, generally
     # each platform lists its own files rather than relying on filtering or
     # removing unused files.
     sources = [
       "app/chrome_exe_resource.h",
     ]
     defines = []
     deps = []
-    data_deps = []
+    datadeps = []
 
     # TODO(GYP) mac_bundle_resources, xcode_settings
 
     # TODO(GYP) order_profiling, order_text_section
 
     if (is_win) {
       sources += [
+        "$target_gen_dir/chrome_exe_version.rc",
         "//content/app/startup_helper_win.cc",
         "//content/public/common/content_switches.cc",
         "app/chrome_crash_reporter_client.cc",
         "app/chrome_crash_reporter_client.h",
         "app/chrome_exe.rc",
         "app/chrome_exe_main_win.cc",
         "app/chrome_watcher_client_win.cc",
         "app/chrome_watcher_client_win.h",
         "app/chrome_watcher_command_line_win.cc",
         "app/chrome_watcher_command_line_win.h",
@@ skipping 92 matching lines @@
         ":packed_extra_resources",
         ":packed_resources",
         "//components/startup_metric_utils",
 
         # Precompiled plugins that need to get copied to the output directory.
         # On Mac, internal plugins go inside the framework, so these
         # dependencies are on chrome.dll.
         "//third_party/adobe/flash:flapper_binaries",
         "//third_party/widevine/cdm:widevinecdmadapter",
       ]
+      # TODO(GYP) some stuff from GYP including chrome_multiple_dll.
     }
 
     if (is_linux && enable_plugins) {
       deps += [ "//pdf" ]
     }
-
-    if (is_multi_dll_chrome) {
-      defines += [ "CHROME_MULTIPLE_DLL" ]
-      data_deps += [ ":chrome_child" ]
-    }
   }
 }  # !is_android
 
 shared_library("main_dll") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
-  defines = []
 
   deps = [
     ":browser_dependencies",
     "//base/allocator",
   ]
   if (is_win) {
     output_name = "chrome"
 
     sources = [
       "$root_gen_dir/base/trace_event/etw_manifest/chrome_events_win.rc",
@@ skipping 38 matching lines @@
 
     # TODO(GYP) Lots of VCLinkerTool stuff on Windows.
 
     # TODO(GYP) chrome_pgo_phase on Windows.
   }
 
   if (use_aura) {
     deps += [ "//ui/compositor" ]
   }
 
-  if (is_multi_dll_chrome) {
+  #TODO(GYP) add chrome_multiple_dll support
+  if (false) {  #chrome_multiple_dll) {
     defines += [ "CHROME_MULTIPLE_DLL_BROWSER" ]
     deps += [ "//content/public/app:browser" ]
   } else {
     deps += [
       ":child_dependencies",
       "//content/public/app:both",
     ]
   }
 
   if (cld_version == 0 || cld_version == 2) {
     deps += [ "//third_party/cld_2" ]
   }
 
   if (is_mac) {
     #['OS=="mac" and component!="shared_library"', {  TODO(GYP)
     #  'includes': [ 'chrome_dll_bundle.gypi' ],
     #}],
     # TODO(GYP) Lots of other stuff in the OS=="mac" block.
   }
 
-  if (enable_plugins && !is_multi_dll_chrome) {
+  if (enable_plugins) {
     deps += [ "//pdf" ]
   }
 }
 
-if (is_multi_dll_chrome) {
-  shared_library("chrome_child") {
-    sources = [
-      "app/chrome_main.cc",
-      "app/chrome_main_delegate.cc",
-      "app/chrome_main_delegate.h",
-      "app/close_handle_hook_win.cc",
-      "app/close_handle_hook_win.h",
-    ]
-
-    configs += [ "//build/config/compiler:wexit_time_destructors" ]
-    defines = [ "CHROME_MULTIPLE_DLL_CHILD" ]
-
-    deps = [
-      ":child_dependencies",
-      ":chrome_dll_version",
-      "//chrome/browser/policy:path_parser",
-      "//content/public/app:child",
-    ]
-
-    if (is_win) {
-      deps += [ "//chrome_elf" ]
-      # TODO(GYP): PGO on Windows.
-      # ['chrome_pgo_phase==1', {
-      #   'msvs_settings': {
-      #     'VCLinkerTool': {
-      #       'LinkTimeCodeGeneration': '2',
-      #     },
-      #   },
-      # }],
-      # ['chrome_pgo_phase==2', {
-      #   'msvs_settings': {
-      #     'VCLinkerTool': {
-      #       'LinkTimeCodeGeneration': '3',
-      #     },
-      #   },
-      # }],
-    }
-    if (enable_plugins) {
-      deps += [ "//pdf" ]
-    }
-  }
-}
-
 # GYP version: chromium_browser_dependencies variable in chrome.gyp
 group("browser_dependencies") {
   deps = [
     "//chrome/browser",
     "//chrome/common",
     "//sync",
   ]
   if (!is_ios) {
     deps += [ "//ppapi/host" ]
   }
@@ skipping 490 matching lines @@
 
     args = [
       rebase_path(infile, root_build_dir),
       rebase_path(outfile, root_build_dir),
       "-e s/@@NAME@@/$name/",
       "-e s/@@FILENAME@@/$filename/",
       "-e s/@@CONFDIR@@/$confdir/",
     ]
   }
 }