Move the safe browsing test into browser_tests instead of having a separate browser test binary. Th…

chrome/chrome_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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 702 matching lines @@
         '../skia/skia.gyp:skia',
         '../sync/protocol/sync_proto.gyp:sync_proto',
         '../sync/sync.gyp:sync_notifier',
         '../sync/sync.gyp:test_support_sync_api',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
         '../v8/tools/gyp/v8.gyp:v8',
         '../webkit/webkit.gyp:test_shell_test_support',
         # Runtime dependencies
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../third_party/mesa/mesa.gyp:osmesa',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
@@ skipping 268 matching lines @@
         'browser/process_singleton_browsertest.cc',
         'browser/profiles/profile_browsertest.cc',
         'browser/profiles/profile_manager_browsertest.cc',
         'browser/protector/default_search_provider_change_browsertest.cc',
         'browser/protector/protector_service_browsertest.cc',
         'browser/referrer_policy_browsertest.cc',
         'browser/renderer_host/render_process_host_chrome_browsertest.cc',
         'browser/renderer_host/web_cache_manager_browsertest.cc',
         'browser/repost_form_warning_browsertest.cc',
         'browser/rlz/rlz_extension_apitest.cc',
+        'browser/safe_browsing/local_safebrowsing_test_server.cc',
         'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
         'browser/safe_browsing/safe_browsing_service_browsertest.cc',
+        'browser/safe_browsing/safe_browsing_test.cc',
         'browser/service/service_process_control_browsertest.cc',
         'browser/sessions/better_session_restore_browsertest.cc',
         'browser/sessions/persistent_tab_restore_service_browsertest.cc',
         'browser/sessions/session_restore_browsertest.cc',
         'browser/speech/extension_api/tts_extension_apitest.cc',
         'browser/speech/speech_input_extension_apitest.cc',
         'browser/speech/speech_recognition_bubble_browsertest.cc',
         'browser/spellchecker/spellcheck_service_browsertest.cc',
         'browser/ssl/ssl_browser_tests.cc',
         'browser/sync_file_system/mock_remote_file_sync_service.cc',
@@ skipping 244 matching lines @@
             # Protector is disabled on CrOS.
             ['exclude', '^browser/protector'],
           ],
           'sources!': [
             'browser/notifications/desktop_notifications_unittest.cc',
             'browser/printing/cloud_print/test/cloud_print_policy_browsertest.cc',
             'browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc',
             'browser/service/service_process_control_browsertest.cc',
             # chromeos does not use cross-platform panels
             'browser/ui/views/panels/panel_view_browsertest.cc',
-            'browser/ui/panels/panel_extension_browsertest.cc',
+            'browser/ui/panels/panel_extension_browsertest.cc',
           ],
           'dependencies': [
             '../dbus/dbus.gyp:dbus_test_support',
             '../build/linux/system.gyp:dbus',
           ],
         }],
         ['file_manager_extension==0', {
           'sources!': [
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
           ],
@@ skipping 334 matching lines @@
             ['linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],  # conditions
     },  # target performance_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',
-        '../net/net.gyp:net_test_support',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        # This is the safebrowsing test server.
-        '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
-        '../ui/ui.gyp:ui_resources',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'defines': [
-        'HAS_OUT_OF_PROC_TEST_RUNNER',
-      ],
-      'sources': [
-        'app/chrome_dll.rc',
-        'browser/safe_browsing/local_safebrowsing_test_server.cc',
-        'browser/safe_browsing/safe_browsing_test.cc',
-        'test/base/chrome_test_launcher.cc',
-      ],
-      'conditions': [
-        ['safe_browsing==0', {
-          'sources!': [
-            'browser/safe_browsing/safe_browsing_test.cc',
-          ],
-        }],
-        ['OS=="win"', {
-          'dependencies': [
-            'chrome_version_resources',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
-          ],
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-        ['OS=="mac"', {
-          # These flags are needed to run the test on Mac.
-          # Search for comments about "xcode_settings" elsewhere in this file.
-          'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
-        }],
-      ],
-    },  # target safe_browsing_tests
-    {
       # To run the tests from page_load_test.cc on Linux, we need to:
       #
       #   a) Build with Breakpad (GYP_DEFINES="linux_chromium_breakpad=1")
       #   b) Run with CHROME_HEADLESS=1 to generate crash dumps.
       #   c) Strip the binary if it's a debug build. (binary may be over 2GB)
       'target_name': 'reliability_tests',
       'type': 'executable',
       'dependencies': [
         'browser',
         'chrome',
@@ skipping 958 matching lines @@
                 # Note build/win/chrome_win.croc uniquely has the
                 # courgette source directory in an include path.
                 '../courgette/courgette.gyp:courgette_unittests',
                 'browser_tests',
                 ]}],
             ['OS=="linux"', {
               'dependencies': [
                 # Win bot needs to be turned into an interactive bot.
                 'interactive_ui_tests',
                 # Disabled from running in coverage_posix.py.
-                # We need to build this during compile step, so enabling here.
+                # We need to build this during compile step, so enabling here. 
                 'browser_tests',
                 '../courgette/courgette.gyp:courgette_unittests',
                 '../crypto/crypto.gyp:crypto_unittests',
                 'chromedriver_unittests',
                 '../build/temp_gyp/googleurl.gyp:googleurl_unittests',
                 'gpu_tests',
                 '../jingle/jingle.gyp:jingle_unittests',
                 '../net/net.gyp:net_perftests',
                 'performance_ui_tests',
                 'reliability_tests',
@@ skipping 147 matching lines @@
             'sync_integration_tests.isolate',
           ],
           'sources': [
             'sync_integration_tests.isolate',
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }