diff options
| -rw-r--r-- | build/all.gyp | 4 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_test.cc (renamed from chrome/browser/safe_browsing/safe_browsing_browsertest.cc) | 0 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 34 |
3 files changed, 37 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index ac4b8e4..5348c74 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -160,6 +160,7 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:nacl_ui_tests', '../chrome/chrome.gyp:nacl_sandbox_tests', + '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:ui_tests', @@ -186,6 +187,7 @@ '../chrome/chrome.gyp:nacl_sandbox_tests', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', + '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_integration_tests', '../chrome/chrome.gyp:sync_unit_tests', @@ -258,6 +260,7 @@ '../chrome/chrome.gyp:nacl_sandbox_tests', '../chrome/chrome.gyp:page_cycler_tests', '../chrome/chrome.gyp:plugin_tests', + '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:selenium_tests', '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_integration_tests', @@ -334,6 +337,7 @@ '../chrome/chrome.gyp:interactive_ui_tests', '../chrome/chrome.gyp:memory_test', '../chrome/chrome.gyp:page_cycler_tests', + '../chrome/chrome.gyp:safe_browsing_tests', '../chrome/chrome.gyp:startup_tests', '../chrome/chrome.gyp:sync_unit_tests', '../chrome/chrome.gyp:tab_switching_test', diff --git a/chrome/browser/safe_browsing/safe_browsing_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 17295cf..17295cf 100644 --- a/chrome/browser/safe_browsing/safe_browsing_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 17ae1a3..080c04b 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1779,7 +1779,6 @@ 'browser/renderer_host/test/render_view_host_manager_browsertest.cc', 'browser/renderer_host/test/renderer_accessibility_browsertest.cc', 'browser/renderer_host/test/web_cache_manager_browsertest.cc', - 'browser/safe_browsing/safe_browsing_browsertest.cc', 'browser/service/service_process_control_browsertest.cc', 'browser/sessions/session_restore_browsertest.cc', 'browser/sessions/tab_restore_service_browsertest.cc', @@ -1936,6 +1935,39 @@ ], # conditions }, # target browser_tests { + # Executable that runs safebrowsing test in a new process. + 'target_name': 'safe_browsing_tests', + 'type': 'executable', + 'msvs_guid': 'BBF2BC2F-7CD8-463E-BE88-CB81AAD92BFE', + 'dependencies': [ + 'chrome', + 'test_support_common', + '../base/base.gyp:base', + '../net/net.gyp:net_test_support', + '../skia/skia.gyp:skia', + '../testing/gtest.gyp:gtest', + ], + 'include_dirs': [ + '..', + ], + 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], + 'sources': [ + 'browser/safe_browsing/safe_browsing_test.cc', + 'test/in_process_browser_test.cc', + 'test/in_process_browser_test.h', + 'test/test_launcher/out_of_proc_test_runner.cc', + 'test/test_launcher/test_runner.cc', + 'test/test_launcher/test_runner.h', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../sandbox/sandbox.gyp:sandbox', + ], + }], + ], + }, # target safe_browsing_tests + { 'target_name': 'startup_tests', 'type': 'executable', 'msvs_guid': 'D3E6C0FD-54C7-4FF2-9AE1-72F2DAFD820C', |