Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index 98f2c0dc8e37be9b0335596d559f38275f9d985e..4e12e0ae6d917127ed20cce59111d981c279137b 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -94,44 +94,6 @@ |
'browser/chromeos/cros/mock_network_library.h', |
'browser/chromeos/cryptohome/mock_async_method_caller.cc', |
'browser/chromeos/cryptohome/mock_async_method_caller.h', |
- 'browser/chromeos/dbus/mock_bluetooth_adapter_client.cc', |
- 'browser/chromeos/dbus/mock_bluetooth_adapter_client.h', |
- 'browser/chromeos/dbus/mock_bluetooth_device_client.cc', |
- 'browser/chromeos/dbus/mock_bluetooth_device_client.h', |
- 'browser/chromeos/dbus/mock_bluetooth_input_client.cc', |
- 'browser/chromeos/dbus/mock_bluetooth_input_client.h', |
- 'browser/chromeos/dbus/mock_bluetooth_manager_client.cc', |
- 'browser/chromeos/dbus/mock_bluetooth_manager_client.h', |
- 'browser/chromeos/dbus/mock_bluetooth_node_client.cc', |
- 'browser/chromeos/dbus/mock_bluetooth_node_client.h', |
- 'browser/chromeos/dbus/mock_cros_disks_client.cc', |
- 'browser/chromeos/dbus/mock_cros_disks_client.h', |
- 'browser/chromeos/dbus/mock_cashew_client.cc', |
- 'browser/chromeos/dbus/mock_cashew_client.h', |
- 'browser/chromeos/dbus/mock_cryptohome_client.cc', |
- 'browser/chromeos/dbus/mock_cryptohome_client.h', |
- 'browser/chromeos/dbus/mock_dbus_thread_manager.cc', |
- 'browser/chromeos/dbus/mock_dbus_thread_manager.h', |
- 'browser/chromeos/dbus/mock_debug_daemon_client.cc', |
- 'browser/chromeos/dbus/mock_debug_daemon_client.h', |
- 'browser/chromeos/dbus/mock_flimflam_ipconfig_client.cc', |
- 'browser/chromeos/dbus/mock_flimflam_ipconfig_client.h', |
- 'browser/chromeos/dbus/mock_flimflam_network_client.cc', |
- 'browser/chromeos/dbus/mock_flimflam_network_client.h', |
- 'browser/chromeos/dbus/mock_flimflam_profile_client.cc', |
- 'browser/chromeos/dbus/mock_flimflam_profile_client.h', |
- 'browser/chromeos/dbus/mock_image_burner_client.cc', |
- 'browser/chromeos/dbus/mock_image_burner_client.h', |
- 'browser/chromeos/dbus/mock_introspectable_client.cc', |
- 'browser/chromeos/dbus/mock_introspectable_client.h', |
- 'browser/chromeos/dbus/mock_power_manager_client.cc', |
- 'browser/chromeos/dbus/mock_power_manager_client.h', |
- 'browser/chromeos/dbus/mock_session_manager_client.cc', |
- 'browser/chromeos/dbus/mock_session_manager_client.h', |
- 'browser/chromeos/dbus/mock_speech_synthesizer_client.cc', |
- 'browser/chromeos/dbus/mock_speech_synthesizer_client.h', |
- 'browser/chromeos/dbus/mock_update_engine_client.cc', |
- 'browser/chromeos/dbus/mock_update_engine_client.h', |
'browser/chromeos/login/mock_login_status_consumer.cc', |
'browser/chromeos/login/mock_login_status_consumer.h', |
'browser/chromeos/login/mock_login_utils.cc', |
@@ -307,6 +269,7 @@ |
['chromeos==1', { |
'dependencies': [ |
'../build/linux/system.gyp:dbus', |
+ '../chromeos/chromeos.gyp:chromeos_test_support', |
], |
}], |
['toolkit_uses_gtk == 1', { |
@@ -1318,11 +1281,7 @@ |
'browser/chromeos/cros/onc_network_parser_unittest.cc', |
'browser/chromeos/cros_settings_unittest.cc', |
'browser/chromeos/customization_document_unittest.cc', |
- 'browser/chromeos/dbus/blocking_method_caller_unittest.cc', |
'browser/chromeos/dbus/cros_dbus_service_unittest.cc', |
- 'browser/chromeos/dbus/flimflam_client_unittest_base.cc', |
- 'browser/chromeos/dbus/flimflam_client_unittest_base.h', |
- 'browser/chromeos/dbus/flimflam_network_client_unittest.cc', |
'browser/chromeos/dbus/introspect_util_unittest.cc', |
'browser/chromeos/dbus/proxy_resolution_service_provider_unittest.cc', |
'browser/chromeos/extensions/file_browser_notifications_unittest.cc', |