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

trunk/src/content/public/app/content_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 "content/public/app/content_main_delegate.h"
 
 #include "content/public/browser/content_browser_client.h"
 
 #if !defined(OS_IOS)
 #include "content/public/plugin/content_plugin_client.h"
@@ skipping 30 matching lines @@
 }
 
 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS)
 
 ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() {
   return NULL;
 }
 
 #endif
 
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
-
-ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-#if defined(OS_IOS)
-  return NULL;
-#else
-  return new ContentRendererClient();
-#endif
+ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+  return new ContentBrowserClient();
 }
 
 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
   return new ContentPluginClient();
 #endif
 }
 
-ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
+#if defined(OS_IOS)
   return NULL;
+#else
+  return new ContentRendererClient();
+#endif
 }
 
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
   return new ContentUtilityClient();
 #endif
 }
 
-#else  // In browser in multiple DLL mode.
-
-ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-  return NULL;
-}
-
-ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
-  return NULL;
-}
-ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
-  return new ContentBrowserClient();
-}
-
-ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
-  return NULL;
-}
-
-#endif
-
-
 }  // namespace content