Merge 212415 "reland of http://crrev.com/212230 Create top-level..."

content/public/app/content_main_delegate.cc

Index: content/public/app/content_main_delegate.cc
===================================================================
--- content/public/app/content_main_delegate.cc	(revision 212608)
+++ content/public/app/content_main_delegate.cc	(working copy)
@@ -49,11 +49,15 @@
 #endif
 
 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
+#if defined(CHROME_MULTIPLE_DLL_CHILD)
+  return NULL;
+#else
   return new ContentBrowserClient();
+#endif
 }
 
 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentPluginClient();
@@ -61,7 +65,7 @@
 }
 
 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentRendererClient();
@@ -69,7 +73,7 @@
 }
 
 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
-#if defined(OS_IOS)
+#if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER)
   return NULL;
 #else
   return new ContentUtilityClient();