| OLD | NEW | 
|---|
| 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 1290 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1301       'conditions': [ | 1301       'conditions': [ | 
| 1302         ['enable_one_click_signin==0', { | 1302         ['enable_one_click_signin==0', { | 
| 1303           'sources!': [ | 1303           'sources!': [ | 
| 1304             'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', | 1304             'browser/ui/gtk/one_click_signin_bubble_gtk_browsertest.cc', | 
| 1305             'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', | 1305             'browser/ui/views/sync/one_click_signin_bubble_view_browsertest.cc', | 
| 1306           ] | 1306           ] | 
| 1307         }], | 1307         }], | 
| 1308         ['disable_nacl==0', { | 1308         ['disable_nacl==0', { | 
| 1309           'sources':[ | 1309           'sources':[ | 
| 1310             'browser/extensions/extension_nacl_browsertest.cc', | 1310             'browser/extensions/extension_nacl_browsertest.cc', | 
|  | 1311             'browser/nacl_host/test/nacl_enable_debug_stub_browsertest.cc', | 
| 1311           ], | 1312           ], | 
| 1312           'conditions': [ | 1313           'conditions': [ | 
| 1313             ['disable_nacl_untrusted==0', { | 1314             ['disable_nacl_untrusted==0', { | 
| 1314               'sources': [ | 1315               'sources': [ | 
| 1315                 'test/nacl/nacl_browsertest.cc', | 1316                 'test/nacl/nacl_browsertest.cc', | 
| 1316                 'test/nacl/nacl_browsertest_uma.cc', | 1317                 'test/nacl/nacl_browsertest_uma.cc', | 
| 1317                 'test/nacl/nacl_browsertest_util.cc', | 1318                 'test/nacl/nacl_browsertest_util.cc', | 
| 1318                 'test/nacl/nacl_browsertest_util.h', | 1319                 'test/nacl/nacl_browsertest_util.h', | 
| 1319               ], | 1320               ], | 
| 1320               'dependencies': [ | 1321               'dependencies': [ | 
| 1321                 'test/data/nacl/nacl_test_data.gyp:*', | 1322                 'test/data/nacl/nacl_test_data.gyp:*', | 
| 1322                 '../ppapi/native_client/native_client.gyp:nacl_irt', | 1323                 '../ppapi/native_client/native_client.gyp:nacl_irt', | 
| 1323                 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests', | 1324                 '../ppapi/ppapi_untrusted.gyp:ppapi_nacl_tests', | 
| 1324               ], | 1325               ], | 
| 1325             }], | 1326             }], | 
| 1326             ['OS=="win" or OS=="linux"', { | 1327             ['OS=="win" or OS=="linux"', { | 
| 1327               'sources': [ | 1328               'sources': [ | 
| 1328                 'browser/nacl_host/test/nacl_gdb_browsertest.cc', | 1329                 'browser/nacl_host/test/nacl_gdb_browsertest.cc', | 
| 1329               ], | 1330               ], | 
| 1330               'dependencies': [ | 1331               'dependencies': [ | 
| 1331                 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb', | 1332                 'browser/nacl_host/test/mock_nacl_gdb.gyp:mock_nacl_gdb', | 
| 1332               ], | 1333               ], | 
| 1333             }], | 1334             }], | 
| 1334             ['OS=="win"', { | 1335             ['OS=="win"', { | 
|  | 1336               # TODO(halyavin) NaCl on Windows can't open debug stub socket | 
|  | 1337               # in browser process as needed by this test. | 
|  | 1338               # See http://crbug.com/157312. | 
|  | 1339               'sources!': [ | 
|  | 1340                 'browser/nacl_host/test/nacl_enable_debug_stub_browsertest.cc', | 
|  | 1341               ], | 
| 1335               'dependencies': [ | 1342               'dependencies': [ | 
| 1336                 'chrome.gyp:chrome_nacl_win64', | 1343                 'chrome.gyp:chrome_nacl_win64', | 
| 1337               ], | 1344               ], | 
| 1338             }], | 1345             }], | 
| 1339           ], | 1346           ], | 
| 1340         }], | 1347         }], | 
| 1341         ['use_ash==1', { | 1348         ['use_ash==1', { | 
| 1342           'dependencies': [ | 1349           'dependencies': [ | 
| 1343             '../ash/ash.gyp:test_support_ash', | 1350             '../ash/ash.gyp:test_support_ash', | 
| 1344           ], | 1351           ], | 
| (...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2859             'sync_integration_tests.isolate', | 2866             'sync_integration_tests.isolate', | 
| 2860           ], | 2867           ], | 
| 2861           'sources': [ | 2868           'sources': [ | 
| 2862             'sync_integration_tests.isolate', | 2869             'sync_integration_tests.isolate', | 
| 2863           ], | 2870           ], | 
| 2864         }, | 2871         }, | 
| 2865       ], | 2872       ], | 
| 2866     }], | 2873     }], | 
| 2867   ],  # 'conditions' | 2874   ],  # 'conditions' | 
| 2868 } | 2875 } | 
| OLD | NEW | 
|---|