Revert 212230 "Create top-level separate targets for browser and..."

trunk/src/chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 75 matching lines @@
 #if defined(USE_X11)
 #include <stdlib.h>
 #include <string.h>
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
+base::LazyInstance<chrome::ChromeContentBrowserClient>
+    g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 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;
-#else  // In browser in multiple DLL mode.
-base::LazyInstance<chrome::ChromeContentBrowserClient>
-    g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
-#endif
 
 #if defined(OS_POSIX)
 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky
     g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER;
 #endif
 
 extern int NaClMain(const content::MainFunctionParams&);
 extern int ServiceProcessMain(const content::MainFunctionParams&);
 
 namespace {
@@ skipping 267 matching lines @@
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
   nacl::RegisterPathProvider();
 #endif
 
 // No support for ANDROID yet as DiagnosticsController needs wchar support.
 // TODO(gspencer): That's not true anymore, or at least there are no w-string
 // references anymore. Not sure if that means this can be enabled on Android or
 // 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) && !defined(CHROME_MULTIPLE_DLL_CHILD)
+#if !defined(OS_ANDROID)
   // 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)) {
     diagnostics::DiagnosticsWriter::FormatType format =
         diagnostics::DiagnosticsWriter::HUMAN;
     if (command_line.HasSwitch(switches::kDiagnosticsFormat)) {
       std::string format_str =
           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
       if (format_str == "machine") {
         format = diagnostics::DiagnosticsWriter::MACHINE;
@@ skipping 264 matching lines @@
 #if defined(OS_WIN)
   SuppressWindowsErrorDialogs();
 #endif
 }
 
 int ChromeMainDelegate::RunProcess(
     const std::string& process_type,
     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) && \
-    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER))
+#if !defined(OS_ANDROID)
   static const MainFunction kMainFunctions[] = {
     { switches::kServiceProcess,     ServiceProcessMain },
 #if defined(OS_MACOSX)
     { switches::kRelauncherProcess,
       mac_relauncher::internal::RelauncherMain },
 #endif
-
-#if !defined(DISABLE_NACL) && \
-    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))
+    // TODO(scottmg): http://crbug.com/237249 NaCl -> child.
+#if !defined(DISABLE_NACL)
     { switches::kNaClLoaderProcess, NaClMain },
 #endif  // DISABLE_NACL
   };
 
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
     if (process_type == kMainFunctions[i].name)
       return kMainFunctions[i].function(main_function_params);
   }
 #endif
 
@@ skipping 47 matching lines @@
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Needs to be called after we have chrome::DIR_USER_DATA.  BrowserMain sets
   // this up for the browser process in a different manner.
   InitCrashReporter();
 #endif
 }
 
 #endif  // OS_MACOSX
 
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
-
-content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
-  return &g_chrome_content_plugin_client.Get();
-}
-
-content::ContentRendererClient*
-ChromeMainDelegate::CreateContentRendererClient() {
-  return &g_chrome_content_renderer_client.Get();
-}
-
-content::ContentUtilityClient*
-ChromeMainDelegate::CreateContentUtilityClient() {
-  return &g_chrome_content_utility_client.Get();
-}
-
-content::ContentBrowserClient*
-ChromeMainDelegate::CreateContentBrowserClient() {
-  return NULL;
-}
-
-#else  // In browser in multiple DLL mode.
-
 content::ContentBrowserClient*
     ChromeMainDelegate::CreateContentBrowserClient() {
   return &g_chrome_content_browser_client.Get();
 }
 
 content::ContentPluginClient* ChromeMainDelegate::CreateContentPluginClient() {
-  return NULL;
+  // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
+  // browser and child parts.
+  return &g_chrome_content_plugin_client.Get();
 }
 
 content::ContentRendererClient*
-ChromeMainDelegate::CreateContentRendererClient() {
-  return NULL;
+    ChromeMainDelegate::CreateContentRendererClient() {
+  return &g_chrome_content_renderer_client.Get();
 }
 
 content::ContentUtilityClient*
-ChromeMainDelegate::CreateContentUtilityClient() {
-  return NULL;
+    ChromeMainDelegate::CreateContentUtilityClient() {
+  return &g_chrome_content_utility_client.Get();
 }
-
-#endif