Create top-level separate targets for browser and child dlls

content/public/app/content_main_delegate.cc

Index: content/public/app/content_main_delegate.cc
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index a16ac60dc0d2a764f677abb8653e564251856ec2..d7a23182e998db962a7f7fd87200b173be3382c3 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -48,26 +48,28 @@ ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() {
 
 #endif
 
-ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
-  return new ContentBrowserClient();
-}
+#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
 
-ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
+ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
-  return new ContentPluginClient();
+  return new ContentRendererClient();
 #endif
 }
 
-ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
+ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
 #if defined(OS_IOS)
   return NULL;
 #else
-  return new ContentRendererClient();
+  return new ContentPluginClient();
 #endif
 }
 
+ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+  return NULL;
+}
+
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
 #if defined(OS_IOS)
   return NULL;
@@ -76,4 +78,24 @@ ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
 #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