Fix content_browsertests and other full stack tests in multiple_dll

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 4234a0326988fbede4d852ad44524bdeaa980e93..0305664b6c6054b5c6643321308b221b56b242c2 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'],