Add chrome_split_dll gyp variable, and duplicate chrome_main_dll target (reland)

content/app/content_main_runner.cc

Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 9f1947a06e8b464bf6a654a650f428d52000c3bf..ed490eb4c8a914eb55e87db91053a14f87604585 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -165,7 +165,8 @@ namespace content {
 
 base::LazyInstance<ContentBrowserClient>
     g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER;
-#if !defined(OS_IOS)
+// TODO(scottmg): http://crbug.com/237249 Split into browser and child.
+#if !defined(OS_IOS) && !defined(CHROME_SPLIT_DLL)
 base::LazyInstance<ContentPluginClient>
     g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ContentRendererClient>
@@ -297,8 +298,13 @@ class ContentClientInitializer {
         process_type == switches::kPpapiPluginProcess) {
       if (delegate)
         content_client->plugin_ = delegate->CreateContentPluginClient();
+      // TODO(scottmg): http://crbug.com/237249 Should be in _child.
+#if !defined(CHROME_SPLIT_DLL)
       if (!content_client->plugin_)
         content_client->plugin_ = &g_empty_content_plugin_client.Get();
+#endif
+      // Single process not supported in split dll mode.
+#if !defined(CHROME_SPLIT_DLL)
     } else if (process_type == switches::kRendererProcess ||
                CommandLine::ForCurrentProcess()->HasSwitch(
                    switches::kSingleProcess)) {
@@ -306,11 +312,15 @@ class ContentClientInitializer {
         content_client->renderer_ = delegate->CreateContentRendererClient();
       if (!content_client->renderer_)
         content_client->renderer_ = &g_empty_content_renderer_client.Get();
+#endif
     } else if (process_type == switches::kUtilityProcess) {
       if (delegate)
         content_client->utility_ = delegate->CreateContentUtilityClient();
+      // TODO(scottmg): http://crbug.com/237249 Should be in _child.
+#if !defined(CHROME_SPLIT_DLL)
       if (!content_client->utility_)
         content_client->utility_ = &g_empty_content_utility_client.Get();
+#endif
     }
 #endif  // !OS_IOS
   }
@@ -401,14 +411,22 @@ int RunNamedProcessTypeMain(
     ContentMainDelegate* delegate) {
   static const MainFunction kMainFunctions[] = {
     { "",                            BrowserMain },
-    { switches::kRendererProcess,    RendererMain },
 #if defined(ENABLE_PLUGINS)
+    // TODO(scottmg): http://crbug.com/237249 This will have to be split into
+    // content_main_runner_browser and content_main_runner_child.
+#if !defined(CHROME_SPLIT_DLL)
     { switches::kPluginProcess,      PluginMain },
     { switches::kWorkerProcess,      WorkerMain },
+#endif
     { switches::kPpapiPluginProcess, PpapiPluginMain },
     { switches::kPpapiBrokerProcess, PpapiBrokerMain },
 #endif
+    // TODO(scottmg): http://crbug.com/237249 This will have to be split into
+    // content_main_runner_browser and content_main_runner_child.
+#if !defined(CHROME_SPLIT_DLL)
     { switches::kUtilityProcess,     UtilityMain },
+    { switches::kRendererProcess,    RendererMain },
+#endif
     { switches::kGpuProcess,         GpuMain },
   };