Fix content_browsertests and other full stack tests in multiple_dll

Tests need both sets of entry point functions, ContentClient embedder
pointers, etc. Now in gyp, the three targets are content_app_browser for
browser-only, content_app_child, which is child-only, and
content_app_both which contains both.

TBR=joth@chromium.org, grt@chromium.org
R=jam@chromium.org
BUG=237249

Review URL: https://chromiumcodereview.appspot.com/21453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215771 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 37 insertions, 18 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 1ddbe4f..c2f23a3 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -80,7 +80,7 @@
         '../components/components.gyp:visitedlink_browser',
         '../components/components.gyp:visitedlink_renderer',
         '../components/components.gyp:web_contents_delegate_android',
-        '../content/content.gyp:content',
+        '../content/content.gyp:content_app_both',
         '../skia/skia.gyp:skia',
         '../gpu/gpu.gyp:command_buffer_service',
         '../gpu/gpu.gyp:gles2_implementation',
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7e830185..18493f8 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -13,7 +13,6 @@
     'chromium_browser_dependencies': [
       'common',
       'browser',
-      '../content/content.gyp:content_app',
       '../sync/sync.gyp:sync',
     ],
     'chromium_child_dependencies': [
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 2c137d0..59b40a2 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -80,6 +80,7 @@
           },
           'dependencies': [
             '<@(chromium_browser_dependencies)',
+            '../content/content.gyp:content_app_browser',
             'app/policy/cloud_policy_codegen.gyp:policy',
           ],
           'conditions': [
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 75adb4e..1b3ef306 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -148,6 +148,7 @@
                 # Chromium functionality directly into the executable.
                 '<@(chromium_browser_dependencies)',
                 '<@(chromium_child_dependencies)',
+                '../content/content.gyp:content_app_both',
                 # Needed for chrome_main.cc initialization of libraries.
                 '../build/linux/system.gyp:gtk',
                 # Needed to use the master_preferences functions
@@ -159,6 +160,7 @@
                 # Chromium functionality directly into the executable.
                 '<@(chromium_browser_dependencies)',
                 '<@(chromium_child_dependencies)',
+                '../content/content.gyp:content_app_both',
                 # Needed for chrome_main.cc initialization of libraries.
                 '../build/linux/system.gyp:x11',
                 '../build/linux/system.gyp:pangocairo',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index a25e968..005ddfd 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -20,7 +20,7 @@
         '../base/base.gyp:test_support_base',
         '../base/base.gyp:base_prefs_test_support',
         '../components/components.gyp:sessions_test_support',
-        '../content/content.gyp:content_app',
+        '../content/content.gyp:content_app_both',
         '../content/content.gyp:test_support_content',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
@@ -438,6 +438,7 @@
         '<@(chromium_child_dependencies)',
         # 2) test-specific support libraries:
         '../base/base.gyp:test_support_base',
+        '../content/content.gyp:content_app_both',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
@@ -2591,6 +2592,7 @@
         # 1) everything that the chrome binaries depend on:
         '<@(chromium_browser_dependencies)',
         '<@(chromium_child_dependencies)',
+        '../content/content.gyp:content_app_both',
         # 2) test-specific support libraries:
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 083c0e3..f2c9b57 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -104,6 +104,7 @@
       'dependencies': [
         '<@(chromium_browser_dependencies)',
         '<@(chromium_child_dependencies)',
+        '../content/content.gyp:content_app_both',
         'chrome_resources.gyp:packed_resources',
         'chrome_resources.gyp:packed_extra_resources',
       ],
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 4225df5..b495cc0 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -412,7 +412,7 @@
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:test_support_common',
         '../chrome/chrome_resources.gyp:chrome_resources',
-        '../content/content.gyp:content_app',
+        '../content/content.gyp:content_app_browser',
         '../content/content.gyp:content_gpu',
         '../content/content.gyp:test_support_content',
         '../net/net.gyp:net',
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index dfab14f..6554d57 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -167,15 +167,14 @@ namespace content {
 
 base::LazyInstance<ContentBrowserClient>
     g_empty_content_browser_client = LAZY_INSTANCE_INITIALIZER;
-#if !defined(OS_IOS) && \
-    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))
+#if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
 base::LazyInstance<ContentPluginClient>
     g_empty_content_plugin_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ContentRendererClient>
     g_empty_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<ContentUtilityClient>
     g_empty_content_utility_client = LAZY_INSTANCE_INITIALIZER;
-#endif  // !OS_IOS
+#endif  // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER
 
 #if defined(OS_WIN)
 
@@ -295,8 +294,7 @@ class ContentClientInitializer {
         content_client->browser_ = &g_empty_content_browser_client.Get();
     }
 
-#if !defined(OS_IOS) && \
-    (!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD))
+#if !defined(OS_IOS) && !defined(CHROME_MULTIPLE_DLL_BROWSER)
     if (process_type == switches::kPluginProcess ||
         process_type == switches::kPpapiPluginProcess) {
       if (delegate)
@@ -322,7 +320,7 @@ class ContentClientInitializer {
       if (!content_client->utility_)
         content_client->utility_ = &g_empty_content_utility_client.Get();
     }
-#endif  // !OS_IOS
+#endif  // !OS_IOS && !CHROME_MULTIPLE_DLL_BROWSER
   }
 };
 
@@ -410,10 +408,10 @@ int RunNamedProcessTypeMain(
     const MainFunctionParams& main_function_params,
     ContentMainDelegate* delegate) {
   static const MainFunction kMainFunctions[] = {
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER)
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
     { "",                            BrowserMain },
 #endif
-#if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
+#if !defined(CHROME_MULTIPLE_DLL_BROWSER)
 #if defined(ENABLE_PLUGINS)
     { switches::kPluginProcess,      PluginMain },
     { switches::kWorkerProcess,      WorkerMain },
@@ -423,7 +421,7 @@ int RunNamedProcessTypeMain(
     { switches::kUtilityProcess,     UtilityMain },
     { switches::kRendererProcess,    RendererMain },
     { switches::kGpuProcess,         GpuMain },
-#endif  // !CHROME_MULTIPLE_DLL || CHROME_MULTIPLE_DLL_CHILD
+#endif  // !CHROME_MULTIPLE_DLL_BROWSER
   };
 
   for (size_t i = 0; i < arraysize(kMainFunctions); ++i) {
diff --git a/content/content.gyp b/content/content.gyp
index 4234a03..0305664 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -46,7 +46,7 @@
           'target_name': 'content',
           'type': 'none',
           'dependencies': [
-            'content_app',
+            'content_app_browser',
             'content_browser',
             'content_child',
             'content_common',
@@ -65,7 +65,7 @@
           ],
         },
         {
-          'target_name': 'content_app',
+          'target_name': 'content_app_browser',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'includes': [
@@ -101,6 +101,17 @@
           ],
         },
         {
+          'target_name': 'content_app_both',
+          'type': 'static_library',
+          'variables': { 'enable_wexit_time_destructors': 1, },
+          'includes': [
+            'content_app.gypi',
+          ],
+          'dependencies': [
+            'content_common',
+          ],
+        },
+        {
           'target_name': 'content_browser',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
@@ -290,7 +301,7 @@
           },
         },
         {
-          'target_name': 'content_app',
+          'target_name': 'content_app_browser',
           'type': 'none',
           'dependencies': ['content', 'content_browser'],
         },
@@ -300,6 +311,11 @@
           'dependencies': ['content', 'content_child'],
         },
         {
+          'target_name': 'content_app_both',
+          'type': 'none',
+          'dependencies': ['content'],
+        },
+        {
           'target_name': 'content_browser',
           'type': 'none',
           'dependencies': ['content'],
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 4ffff1a..8312091 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -27,7 +27,7 @@
         'chromium_code': 1,
       },
       'dependencies': [
-        'content_app',
+        'content_app_both',
         'content_browser',
         'content_common',
         'content_gpu',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0d1a7eb..b92a325 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -16,7 +16,7 @@
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui_test_support',
         '../url/url.gyp:url_lib',
-        'content_app',
+        'content_app_both',
         'content_browser',
         'content_common',
       ],