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

trunk/src/content/public/app/content_main_delegate.cc

Index: trunk/src/content/public/app/content_main_delegate.cc
===================================================================
--- trunk/src/content/public/app/content_main_delegate.cc	(revision 212238)
+++ trunk/src/content/public/app/content_main_delegate.cc	(working copy)
@@ -48,28 +48,26 @@
 
 #endif
 
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
+ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+  return new ContentBrowserClient();
+}
 
-ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
+ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
-  return new ContentRendererClient();
+  return new ContentPluginClient();
 #endif
 }
 
-ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
+ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
-  return new ContentPluginClient();
+  return new ContentRendererClient();
 #endif
 }
 
-ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
-  return NULL;
-}
-
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
 #if defined(OS_IOS)
   return NULL;
@@ -78,24 +76,4 @@
 #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