reland of http://crrev.com/212230 Create top-level separate targets for...

Original CL here: https://codereview.chromium.org/17619005/

Changed since previous landing is diff between ps1 and ps2.
Diff since previous landing is a bit noisy, but in those files
against original is relatively small. The conditions for the
defines were incorrect and are simpler (and correct) now.

Previously:

Create top-level separate targets for browser and child dlls

The general idea is that there's top level targets chrome and chrome_child,
and corresponding content_app and content_app_child that depend on only
the subtargets that should be included in the appropriate dll.

Currently (probably) Windows-only and requires setting chrome_multiple_dll=1
for gyp.

Links, but Blink is still included in browser.

Single-process mode is currently disabled when chrome_multiple_dll is set.

Current graph is at:
http://commondatastorage.googleapis.com/chromelinkgraph/deps.html generated by
"python tools\win\split_link\graph_dependencies.py deps.html"

Remove the previous hacky-er attempt at this that was named "split dll".

TBR=jam@chromium.org
BUG=237249, 256965

Review URL: https://codereview.chromium.org/19572013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212415 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 3 deletions

diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index a16ac60..88ce4aa 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -49,11 +49,15 @@ ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() {
 #endif
 
 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+#if defined(CHROME_MULTIPLE_DLL_CHILD)
+  return NULL;
+#else
   return new ContentBrowserClient();
+#endif
 }
 
 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentPluginClient();
@@ -61,7 +65,7 @@ ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
 }
 
 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentRendererClient();
@@ -69,7 +73,7 @@ ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
 }
 
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentUtilityClient();