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

Side by Side Diff: chromeos/chromeos.gyp

Issue 20087002: Add migration from CaCert NSS nicknames to PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unittests depending on NetworkHandler and not on CertLoader. Created 7 years, 4 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 | « chromeos/cert_loader.cc ('k') | chromeos/dbus/shill_service_client_stub.cc » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chromeos_memory.gypi', 10 'chromeos_memory.gypi',
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 'network/device_state.cc', 221 'network/device_state.cc',
222 'network/device_state.h', 222 'network/device_state.h',
223 'network/favorite_state.cc', 223 'network/favorite_state.cc',
224 'network/favorite_state.h', 224 'network/favorite_state.h',
225 'network/geolocation_handler.cc', 225 'network/geolocation_handler.cc',
226 'network/geolocation_handler.h', 226 'network/geolocation_handler.h',
227 'network/managed_network_configuration_handler.cc', 227 'network/managed_network_configuration_handler.cc',
228 'network/managed_network_configuration_handler.h', 228 'network/managed_network_configuration_handler.h',
229 'network/managed_state.cc', 229 'network/managed_state.cc',
230 'network/managed_state.h', 230 'network/managed_state.h',
231 'network/network_cert_migrator.cc',
232 'network/network_cert_migrator.h',
231 'network/network_change_notifier_chromeos.cc', 233 'network/network_change_notifier_chromeos.cc',
232 'network/network_change_notifier_chromeos.h', 234 'network/network_change_notifier_chromeos.h',
233 'network/network_change_notifier_factory_chromeos.cc', 235 'network/network_change_notifier_factory_chromeos.cc',
234 'network/network_change_notifier_factory_chromeos.h', 236 'network/network_change_notifier_factory_chromeos.h',
235 'network/network_configuration_handler.cc', 237 'network/network_configuration_handler.cc',
236 'network/network_configuration_handler.h', 238 'network/network_configuration_handler.h',
237 'network/network_connection_handler.cc', 239 'network/network_connection_handler.cc',
238 'network/network_connection_handler.h', 240 'network/network_connection_handler.h',
239 'network/network_device_handler.cc', 241 'network/network_device_handler.cc',
240 'network/network_device_handler.h', 242 'network/network_device_handler.h',
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 'target_name': 'chromeos_unittests', 442 'target_name': 'chromeos_unittests',
441 'type': 'executable', 443 'type': 'executable',
442 'dependencies': [ 444 'dependencies': [
443 '../base/base.gyp:run_all_unittests', 445 '../base/base.gyp:run_all_unittests',
444 '../base/base.gyp:test_support_base', 446 '../base/base.gyp:test_support_base',
445 '../build/linux/system.gyp:dbus', 447 '../build/linux/system.gyp:dbus',
446 '../build/linux/system.gyp:ssl', 448 '../build/linux/system.gyp:ssl',
447 '../crypto/crypto.gyp:crypto', 449 '../crypto/crypto.gyp:crypto',
448 '../dbus/dbus.gyp:dbus_test_support', 450 '../dbus/dbus.gyp:dbus_test_support',
449 '../net/net.gyp:net', 451 '../net/net.gyp:net',
452 '../net/net.gyp:net_test_support',
450 '../testing/gmock.gyp:gmock', 453 '../testing/gmock.gyp:gmock',
451 '../testing/gtest.gyp:gtest', 454 '../testing/gtest.gyp:gtest',
452 '../url/url.gyp:url_lib', 455 '../url/url.gyp:url_lib',
453 'chromeos_test_support', 456 'chromeos_test_support',
454 'power_manager_proto', 457 'power_manager_proto',
455 ], 458 ],
456 'sources': [ 459 'sources': [
457 'app_mode/kiosk_oem_manifest_parser_unittest.cc', 460 'app_mode/kiosk_oem_manifest_parser_unittest.cc',
458 'attestation/attestation_flow_unittest.cc', 461 'attestation/attestation_flow_unittest.cc',
459 'audio/cras_audio_handler_unittest.cc', 462 'audio/cras_audio_handler_unittest.cc',
(...skipping 27 matching lines...) Expand all
487 'ime/component_extension_ime_manager_unittest.cc', 490 'ime/component_extension_ime_manager_unittest.cc',
488 'ime/extension_ime_util_unittest.cc', 491 'ime/extension_ime_util_unittest.cc',
489 'ime/input_method_manager.h', 492 'ime/input_method_manager.h',
490 'ime/input_method_property_unittest.cc', 493 'ime/input_method_property_unittest.cc',
491 'ime/input_method_whitelist_unittest.cc', 494 'ime/input_method_whitelist_unittest.cc',
492 'ime/xkeyboard_unittest.cc', 495 'ime/xkeyboard_unittest.cc',
493 'login/login_state_unittest.cc', 496 'login/login_state_unittest.cc',
494 'network/cros_network_functions_unittest.cc', 497 'network/cros_network_functions_unittest.cc',
495 'network/geolocation_handler_unittest.cc', 498 'network/geolocation_handler_unittest.cc',
496 'network/managed_network_configuration_handler_unittest.cc', 499 'network/managed_network_configuration_handler_unittest.cc',
500 'network/network_cert_migrator_unittest.cc',
497 'network/network_change_notifier_chromeos_unittest.cc', 501 'network/network_change_notifier_chromeos_unittest.cc',
498 'network/network_configuration_handler_unittest.cc', 502 'network/network_configuration_handler_unittest.cc',
499 'network/network_connection_handler_unittest.cc', 503 'network/network_connection_handler_unittest.cc',
500 'network/network_device_handler_unittest.cc', 504 'network/network_device_handler_unittest.cc',
501 'network/network_event_log_unittest.cc', 505 'network/network_event_log_unittest.cc',
502 'network/network_profile_handler_stub.h', 506 'network/network_profile_handler_stub.h',
503 'network/network_sms_handler_unittest.cc', 507 'network/network_sms_handler_unittest.cc',
504 'network/network_state_handler_unittest.cc', 508 'network/network_state_handler_unittest.cc',
505 'network/network_state_unittest.cc', 509 'network/network_state_unittest.cc',
506 'network/network_ui_data_unittest.cc', 510 'network/network_ui_data_unittest.cc',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 '../third_party/cros_system_api/dbus/power_manager/suspend.proto', 544 '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
541 ], 545 ],
542 'variables': { 546 'variables': {
543 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager', 547 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
544 'proto_out_dir': 'chromeos/dbus/power_manager', 548 'proto_out_dir': 'chromeos/dbus/power_manager',
545 }, 549 },
546 'includes': ['../build/protoc.gypi'], 550 'includes': ['../build/protoc.gypi'],
547 }, 551 },
548 ], 552 ],
549 } 553 }
OLDNEW
« no previous file with comments | « chromeos/cert_loader.cc ('k') | chromeos/dbus/shill_service_client_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698