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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10905087: Revert 154861 - Run safebrowsing_service_test through the net testserver code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_testserver.py ('k') | net/test/base_test_server.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 3578 matching lines...) Expand 10 before | Expand all | Expand 10 after
3589 '../ui/ui.gyp:ui_resources', 3589 '../ui/ui.gyp:ui_resources',
3590 ], 3590 ],
3591 'include_dirs': [ 3591 'include_dirs': [
3592 '..', 3592 '..',
3593 ], 3593 ],
3594 'defines': [ 3594 'defines': [
3595 'HAS_OUT_OF_PROC_TEST_RUNNER', 3595 'HAS_OUT_OF_PROC_TEST_RUNNER',
3596 ], 3596 ],
3597 'sources': [ 3597 'sources': [
3598 'app/chrome_dll.rc', 3598 'app/chrome_dll.rc',
3599 'browser/safe_browsing/local_safebrowsing_test_server.cc',
3600 'browser/safe_browsing/safe_browsing_test.cc', 3599 'browser/safe_browsing/safe_browsing_test.cc',
3601 'test/base/chrome_test_launcher.cc', 3600 'test/base/chrome_test_launcher.cc',
3602 ], 3601 ],
3603 'conditions': [ 3602 'conditions': [
3604 ['safe_browsing==0', { 3603 ['safe_browsing==0', {
3605 'sources!': [ 3604 'sources!': [
3606 'browser/safe_browsing/safe_browsing_test.cc', 3605 'browser/safe_browsing/safe_browsing_test.cc',
3607 ], 3606 ],
3608 }], 3607 }],
3609 ['OS=="win"', { 3608 ['OS=="win"', {
(...skipping 1167 matching lines...) Expand 10 before | Expand all | Expand 10 after
4777 '--result', '<@(_outputs)', 4776 '--result', '<@(_outputs)',
4778 '--isolate', 'browser_tests.isolate', 4777 '--isolate', 'browser_tests.isolate',
4779 ], 4778 ],
4780 }, 4779 },
4781 ], 4780 ],
4782 }, 4781 },
4783 ], 4782 ],
4784 }], 4783 }],
4785 ], # 'conditions' 4784 ], # 'conditions'
4786 } 4785 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_testserver.py ('k') | net/test/base_test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698