Fix content_browsertests and other full stack tests in multiple_dll

content/content_shell.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
     'content_shell_version': '19.77.34.5',
     'conditions': [
       ['OS=="linux"', {
        'use_custom_freetype%': 1,
       }, {
        'use_custom_freetype%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'content_shell_lib',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
       'variables': {
         'chromium_code': 1,
       },
       'dependencies': [
-        'content_app',
+        'content_app_both',
         'content_browser',
         'content_common',
         'content_gpu',
         'content_plugin',
         'content_ppapi_plugin',
         'content_renderer',
         'content_shell_resources',
         'content_utility',
         'content_worker',
         'test_support_content',
@@ skipping 697 matching lines @@
                 '../tools/imagediff/image_diff.gyp:image_diff#host',
               ],
             }],
           ],
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }