Enable content component (again!).

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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' : {
     # Variables for js2gtest rules
     'gypv8sh': '../tools/gypv8sh.py',
     'js2gtest': 'test/base/js2gtest.js',
     'mock_js': 'third_party/mock4js/mock4js.js',
     'test_api_js': 'test/data/webui/test_api.js',
@@ skipping 2342 matching lines @@
           ],
         }],
         ['use_cups==1 and OS!="mac"', {
           'defines': [
             'USE_CUPS',
           ],
           'sources': [
             'browser/printing/print_system_task_proxy_unittest.cc',
           ],
         }],
+        ['component=="shared_library" and incremental_chrome_dll!=1', {
+          # This is needed for tests that subclass
+          # RendererWebKitPlatformSupportImpl, which subclasses stuff in
+          # glue, which refers to symbols defined in these files.
+          # Hopefully this can be resolved with http://crbug.com/98755.
+          'sources': [
+            '../content/renderer/renderer_glue.cc',
+            '../content/common/socket_stream_dispatcher.cc',
+          ]},
+        ],
       ],
     },
     {
       # Executable that runs each browser test in a new process.
       'target_name': 'browser_tests',
       'type': 'executable',
       'msvs_cygwin_shell': 0,
       'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
       'dependencies': [
         'browser',
@@ skipping 595 matching lines @@
           ],
         }],
         ['target_arch!="arm"', {
           'dependencies': [
             # build time dependency.
             '../v8/tools/gyp/v8.gyp:v8_shell#host',
             # run time dependency
             '../webkit/webkit.gyp:copy_npapi_test_plugin',
           ],
         }],
+        ['component=="shared_library" and incremental_chrome_dll!=1', {
+          # This is needed for tests that subclass
+          # RendererWebKitPlatformSupportImpl, which subclasses stuff in
+          # glue, which refers to symbols defined in these files.
+          # Hopefully this can be resolved with http://crbug.com/98755.
+          'sources': [
+            '../content/renderer/renderer_glue.cc',
+            '../content/common/socket_stream_dispatcher.cc',
+          ]},
+        ],
       ],  # conditions
     },  # target browser_tests
     {
       # Executable that runs safebrowsing test in a new process.
       'target_name': 'safe_browsing_tests',
       'type': 'executable',
       'dependencies': [
         'chrome',
         'test_support_common',
         '../base/base.gyp:base',
@@ skipping 1288 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }