Merged FakedDBusThreadManager with DBusThreadManager.

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 137 matching lines @@
         'dbus/fake_bluetooth_gatt_service_service_provider.cc',
         'dbus/fake_bluetooth_gatt_service_service_provider.h',
         'dbus/fake_bluetooth_input_client.cc',
         'dbus/fake_bluetooth_input_client.h',
         'dbus/fake_bluetooth_profile_manager_client.cc',
         'dbus/fake_bluetooth_profile_manager_client.h',
         'dbus/fake_bluetooth_profile_service_provider.cc',
         'dbus/fake_bluetooth_profile_service_provider.h',
         'dbus/fake_cryptohome_client.cc',
         'dbus/fake_cryptohome_client.h',
-        'dbus/fake_dbus_thread_manager.cc',
-        'dbus/fake_dbus_thread_manager.h',
         'dbus/fake_debug_daemon_client.cc',
         'dbus/fake_debug_daemon_client.h',
         'dbus/fake_easy_unlock_client.cc',
         'dbus/fake_easy_unlock_client.h',
         'dbus/fake_gsm_sms_client.cc',
         'dbus/fake_gsm_sms_client.h',
         'dbus/fake_image_burner_client.cc',
         'dbus/fake_image_burner_client.h',
         'dbus/fake_introspectable_client.cc',
         'dbus/fake_introspectable_client.h',
@@ skipping 489 matching lines @@
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
 
   ],
 }