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

chrome/app/chrome_main_delegate.cc

Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index c8d224bbfc9a11db3058946bacbada5843493f29..ab692b65e83bd130d0f75044ac9a3c046af190ff 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -93,14 +93,19 @@
 #include "chrome/app/breakpad_linux.h"
 #endif
 
+#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER)
 base::LazyInstance<chrome::ChromeContentBrowserClient>
     g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
+#endif
+
+#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
 base::LazyInstance<chrome::ChromeContentRendererClient>
     g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<chrome::ChromeContentUtilityClient>
     g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<chrome::ChromeContentPluginClient>
     g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
+#endif  // !CHROME_MULTIPLE_DLL || CHROME_MULTIPLE_DLL_CHILD
 
 #if defined(OS_POSIX)
 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
@@ -388,7 +393,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
 // not though: it still uses string16. As there is no easily accessible command
 // line on Android, I'm not sure this is a big deal, at least for purposes of
 // troubleshooting with a customer.
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(CHROME_MULTIPLE_DLL_CHILD)
   // If we are in diagnostics mode this is the end of the line: after the
   // diagnostics are run the process will invariably exit.
   if (command_line.HasSwitch(switches::kDiagnostics)) {
@@ -673,15 +678,17 @@ int ChromeMainDelegate::RunProcess(
     const content::MainFunctionParams& main_function_params) {
   // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize
   // doesn't support empty array. So we comment out the block for Android.
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && \
+    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER))
   static const MainFunction kMainFunctions[] = {
     { switches::kServiceProcess,     ServiceProcessMain },
 #if defined(OS_MACOSX)
     { switches::kRelauncherProcess,
       mac_relauncher::internal::RelauncherMain },
 #endif
-    // TODO(scottmg): http://crbug.com/237249 NaCl -> child.
-#if !defined(DISABLE_NACL)
+
+#if !defined(DISABLE_NACL) && \
+    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))
     { switches::kNaClLoaderProcess, NaClMain },
 #endif  // DISABLE_NACL
   };
@@ -750,22 +757,36 @@ void ChromeMainDelegate::ZygoteForked() {
 #endif  // OS_MACOSX
 
 content::ContentBrowserClient*
-    ChromeMainDelegate::CreateContentBrowserClient() {
+ChromeMainDelegate::CreateContentBrowserClient() {
+#if defined(CHROME_MULTIPLE_DLL_CHILD)
+  return NULL;
+#else
   return &g_chrome_content_browser_client.Get();
+#endif
 }
 
 content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
-  // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
-  // browser and child parts.
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
+  return NULL;
+#else
   return &g_chrome_content_plugin_client.Get();
+#endif
 }
 
 content::ContentRendererClient*
-    ChromeMainDelegate::CreateContentRendererClient() {
+ChromeMainDelegate::CreateContentRendererClient() {
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
+  return NULL;
+#else
   return &g_chrome_content_renderer_client.Get();
+#endif
 }
 
 content::ContentUtilityClient*
-    ChromeMainDelegate::CreateContentUtilityClient() {
+ChromeMainDelegate::CreateContentUtilityClient() {
+#if defined(CHROME_MULTIPLE_DLL_BROWSER)
+  return NULL;
+#else
   return &g_chrome_content_utility_client.Get();
+#endif
 }