Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..."

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.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 70 matching lines @@
 #include <string.h>
 #include "ui/base/x/x11_util.h"
 #endif
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 base::LazyInstance<chrome::ChromeContentBrowserClient>
     g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;
-// TODO(scottmg): http://crbug.com/237249 This will have to be split out into
-// browser and child parts.
-#if !defined(CHROME_SPLIT_DLL)
 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
 
 extern int NaClMain(const content::MainFunctionParams&);
 extern int ServiceProcessMain(const content::MainFunctionParams&);
 
 namespace {
 
 #if defined(OS_WIN)
 const wchar_t kProfilingDll[] = L"memory_watcher.dll";
 
 // Load the memory profiling DLL.  All it needs to be activated
@@ skipping 517 matching lines @@
     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)
   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) && !defined(CHROME_SPLIT_DLL)
+#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 53 matching lines @@
 }
 
 #endif  // OS_MACOSX
 
 content::ContentBrowserClient*
     ChromeMainDelegate::CreateContentBrowserClient() {
   return &g_chrome_content_browser_client.Get();
 }
 
 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_SPLIT_DLL)
-  return NULL;
-#else
   return &g_chrome_content_plugin_client.Get();
-#endif
 }
 
 content::ContentRendererClient*
     ChromeMainDelegate::CreateContentRendererClient() {
-  // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
-  // browser and child parts.
-#if defined(CHROME_SPLIT_DLL)
-  return NULL;
-#else
   return &g_chrome_content_renderer_client.Get();
-#endif
 }
 
 content::ContentUtilityClient*
     ChromeMainDelegate::CreateContentUtilityClient() {
-  // TODO(scottmg): http://crbug.com/237249 This will have to be split out into
-  // browser and child parts.
-#if defined(CHROME_SPLIT_DLL)
-  return NULL;
-#else
   return &g_chrome_content_utility_client.Get();
-#endif
 }