Added switch that let us 'un-stub' certain dbus clients.

chromeos/chromeos.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chromeos_tools.gypi'
@@ skipping 97 matching lines @@
         'dbus/bluetooth_profile_service_provider.h',
         'dbus/cras_audio_client.cc',
         'dbus/cras_audio_client.h',
         'dbus/cras_audio_client_stub_impl.cc',
         'dbus/cras_audio_client_stub_impl.h',
         'dbus/cros_disks_client.cc',
         'dbus/cros_disks_client.h',
         'dbus/cryptohome_client.cc',
         'dbus/cryptohome_client.h',
         'dbus/dbus_client_implementation_type.h',
+        'dbus/dbus_client_bundle.h',

[hashimoto, 2014/08/08 02:06:15]

nit: sort

[zel, 2014/08/08 19:00:14]

Done.

+        'dbus/dbus_client_bundle.cc',
         'dbus/dbus_method_call_status.cc',
         'dbus/dbus_method_call_status.h',
         'dbus/dbus_thread_manager.cc',
         'dbus/dbus_thread_manager.h',
         'dbus/debug_daemon_client.cc',
         'dbus/debug_daemon_client.h',
         'dbus/easy_unlock_client.cc',
         'dbus/easy_unlock_client.h',
         'dbus/fake_bluetooth_adapter_client.cc',
         'dbus/fake_bluetooth_adapter_client.h',
@@ skipping 68 matching lines @@
         'dbus/fake_system_clock_client.cc',
         'dbus/fake_system_clock_client.h',
         'dbus/gsm_sms_client.cc',
         'dbus/gsm_sms_client.h',
         'dbus/image_burner_client.cc',
         'dbus/image_burner_client.h',
         'dbus/introspectable_client.cc',
         'dbus/introspectable_client.h',
         'dbus/lorgnette_manager_client.cc',
         'dbus/lorgnette_manager_client.h',
+        'dbus/mixed_dbus_thread_manager.cc',
+        'dbus/mixed_dbus_thread_manager.h',
         'dbus/modem_messaging_client.cc',
         'dbus/modem_messaging_client.h',
         'dbus/nfc_adapter_client.cc',
         'dbus/nfc_adapter_client.h',
         'dbus/nfc_client_helpers.cc',
         'dbus/nfc_client_helpers.h',
         'dbus/nfc_device_client.cc',
         'dbus/nfc_device_client.h',
         'dbus/nfc_manager_client.cc',
         'dbus/nfc_manager_client.h',
@@ skipping 311 matching lines @@
         'power_manager_proto',
       ],
       'sources': [
         'app_mode/kiosk_oem_manifest_parser_unittest.cc',
         'attestation/attestation_flow_unittest.cc',
         'audio/cras_audio_handler_unittest.cc',
         'cert_loader_unittest.cc',
         'cryptohome/system_salt_getter_unittest.cc',
         'dbus/blocking_method_caller_unittest.cc',
         'dbus/cros_disks_client_unittest.cc',
+        'dbus/dbus_client_bundle_unittest.cc',
         'dbus/gsm_sms_client_unittest.cc',
         'dbus/introspectable_client_unittest.cc',
         'dbus/modem_messaging_client_unittest.cc',
         'dbus/nfc_client_unittest.cc',
         'dbus/power_policy_controller_unittest.cc',
         'dbus/shill_client_unittest_base.cc',
         'dbus/shill_client_unittest_base.h',
         'dbus/shill_device_client_unittest.cc',
         'dbus/shill_ipconfig_client_unittest.cc',
         'dbus/shill_manager_client_unittest.cc',
@@ skipping 93 matching lines @@
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
 
   ],
 }