[Android] Fix remaining linker errors for components build

content/content_tests.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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 622 matching lines @@
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
           'sources!': [
             'browser/accessibility/browser_accessibility_win_unittest.cc',
           ],
         }],
         ['OS == "android"', {
+          'dependencies': [
+            '../ui/ui.gyp:shell_dialogs',
+          ],
           'sources!': [
             'browser/geolocation/device_data_provider_unittest.cc',
             'browser/geolocation/gps_location_provider_unittest_linux.cc',
             'browser/geolocation/network_location_provider_unittest.cc',
             'browser/geolocation/wifi_data_provider_chromeos_unittest.cc',
             'browser/geolocation/wifi_data_provider_common_unittest.cc',
             'browser/geolocation/wifi_data_provider_linux_unittest.cc',
           ],
         }],
         ['OS != "android" and OS != "ios"', {
@@ skipping 98 matching lines @@
             'browser/renderer_host/render_widget_host_browsertest.cc',
             'browser/renderer_host/render_widget_host_view_browsertest.cc',
             'browser/renderer_host/render_widget_host_view_win_browsertest.cc',
             'browser/security_exploit_browsertest.cc',
             'browser/session_history_browsertest.cc',
             'browser/site_per_process_browsertest.cc',
             'browser/speech/speech_recognition_browsertest.cc',
             'browser/web_contents/web_contents_view_aura_browsertest.cc',
             'browser/webkit_browsertest.cc',
             'browser/worker_host/test/worker_browsertest.cc',
-            'common/content_constants_internal.cc',
-            'common/content_constants_internal.h',
             'renderer/accessibility/renderer_accessibility_browsertest.cc',
             'renderer/browser_plugin/mock_browser_plugin.h',
             'renderer/browser_plugin/mock_browser_plugin.cc',
             'renderer/browser_plugin/mock_browser_plugin_manager.h',
             'renderer/browser_plugin/mock_browser_plugin_manager.cc',
             'renderer/browser_plugin/browser_plugin_browsertest.h',
             'renderer/browser_plugin/browser_plugin_browsertest.cc',
             'renderer/mouse_lock_dispatcher_browsertest.cc',
             'renderer/password_form_conversion_utils_browsertest.cc',
             'renderer/pepper/mock_renderer_ppapi_host.cc',
@@ skipping 69 matching lines @@
               ],
             }],
             ['OS=="linux"', {
               'sources!': [
                 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
               ],
             }],
             ['OS=="android"', {
               'sources!': [
                 'browser/accessibility/dump_accessibility_tree_browsertest.cc',
-                # These are included via dependency on content_common and hence
-                # we get multiple definition errors in a shared library build.
-                # Other builds need it as the symbols are not exported.
-                'common/content_constants_internal.cc',
-                'common/content_constants_internal.h',
               ],
               'sources': [
                 'shell/android/browsertests_apk/content_browser_tests_android.cc',
               ],
               'dependencies': [
                 'content_shell_jni_headers',
                 'content_shell_lib',
                 '../testing/android/native_test.gyp:native_test_util',
               ],
             }],
@@ skipping 202 matching lines @@
             'resource_dir': 'shell/android/shell_apk/res',
             'additional_src_dirs': ['public/android/javatests/',],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }