Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1110723002: Split to SafeBrowsingDatabaseManager into Local* and Remote*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mismerge Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chrome_browser_extensions_test_support_sources': [ 6 'chrome_browser_extensions_test_support_sources': [
7 # A list of sources which is shared between different browser tests. 7 # A list of sources which is shared between different browser tests.
8 'browser/apps/app_browsertest_util.cc', 8 'browser/apps/app_browsertest_util.cc',
9 'browser/apps/app_browsertest_util.h', 9 'browser/apps/app_browsertest_util.h',
10 'browser/extensions/browsertest_util.cc', 10 'browser/extensions/browsertest_util.cc',
(...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 'browser/ui/webui/policy_ui_browsertest.cc', 782 'browser/ui/webui/policy_ui_browsertest.cc',
783 ], 783 ],
784 'chrome_browser_tests_speech_sources': [ 784 'chrome_browser_tests_speech_sources': [
785 'browser/speech/extension_api/tts_extension_apitest.cc', 785 'browser/speech/extension_api/tts_extension_apitest.cc',
786 ], 786 ],
787 'chrome_browser_tests_full_safe_browsing_sources': [ 787 'chrome_browser_tests_full_safe_browsing_sources': [
788 'browser/safe_browsing/local_safebrowsing_test_server.cc', 788 'browser/safe_browsing/local_safebrowsing_test_server.cc',
789 'browser/safe_browsing/safe_browsing_blocking_page_test.cc', 789 'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
790 'browser/safe_browsing/safe_browsing_service_browsertest.cc', 790 'browser/safe_browsing/safe_browsing_service_browsertest.cc',
791 'browser/safe_browsing/safe_browsing_test.cc', 791 'browser/safe_browsing/safe_browsing_test.cc',
792 'browser/safe_browsing/test_database_manager.cc',
793 'browser/safe_browsing/test_database_manager.h',
792 'renderer/safe_browsing/malware_dom_details_browsertest.cc', 794 'renderer/safe_browsing/malware_dom_details_browsertest.cc',
793 'renderer/safe_browsing/phishing_classifier_browsertest.cc', 795 'renderer/safe_browsing/phishing_classifier_browsertest.cc',
794 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc', 796 'renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc',
795 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc', 797 'renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc',
796 ], 798 ],
797 'chrome_browser_tests_remoting_sources': [ 799 'chrome_browser_tests_remoting_sources': [
798 'test/remoting/auth_browsertest.cc', 800 'test/remoting/auth_browsertest.cc',
799 'test/remoting/fullscreen_browsertest.cc', 801 'test/remoting/fullscreen_browsertest.cc',
800 'test/remoting/it2me_browsertest.cc', 802 'test/remoting/it2me_browsertest.cc',
801 'test/remoting/key_code_conv.cc', 803 'test/remoting/key_code_conv.cc',
(...skipping 2129 matching lines...) Expand 10 before | Expand all | Expand 10 after
2931 'dependencies': [ 2933 'dependencies': [
2932 'chrome_java', 2934 'chrome_java',
2933 'chrome_shell_apk_java', 2935 'chrome_shell_apk_java',
2934 'chrome_java_test_support', 2936 'chrome_java_test_support',
2935 '../base/base.gyp:base', 2937 '../base/base.gyp:base',
2936 '../base/base.gyp:base_java_test_support', 2938 '../base/base.gyp:base_java_test_support',
2937 '../components/components.gyp:invalidation_javatests', 2939 '../components/components.gyp:invalidation_javatests',
2938 '../components/components.gyp:precache_javatests', 2940 '../components/components.gyp:precache_javatests',
2939 '../content/content_shell_and_tests.gyp:content_java_test_support', 2941 '../content/content_shell_and_tests.gyp:content_java_test_support',
2940 '../sync/sync.gyp:sync_javatests', 2942 '../sync/sync.gyp:sync_javatests',
2941 '../testing/android/on_device_instrumentation.gyp:broker_java',
2942 '../testing/android/on_device_instrumentation.gyp:require_driver_apk ',
2943 '../ui/android/ui_android.gyp:ui_javatests', 2943 '../ui/android/ui_android.gyp:ui_javatests',
2944 ], 2944 ],
2945 'variables': { 2945 'variables': {
2946 'apk_name': 'ChromeShellTest', 2946 'apk_name': 'ChromeShellTest',
2947 'java_in_dir': 'android/shell/javatests', 2947 'java_in_dir': 'android/shell/javatests',
2948 'additional_src_dirs': ['android/javatests/src'], 2948 'additional_src_dirs': ['android/javatests/src'],
2949 'is_test_apk': 1, 2949 'is_test_apk': 1,
2950 }, 2950 },
2951 'includes': [ '../build/java_apk.gypi' ], 2951 'includes': [ '../build/java_apk.gypi' ],
2952 }, 2952 },
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
3242 ['enable_webrtc==1', { 3242 ['enable_webrtc==1', {
3243 'dependencies': [ 3243 'dependencies': [
3244 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3244 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3245 ] 3245 ]
3246 }], 3246 }],
3247 ], 3247 ],
3248 }] 3248 }]
3249 }], 3249 }],
3250 ], # 'conditions' 3250 ], # 'conditions'
3251 } 3251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698