cryptohome: Merge FakeCryptohomeClient and CryptohomeClinentStubImpl

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_memory.gypi',
@@ skipping 67 matching lines @@
         'dbus/bluetooth_profile_service_provider.cc',
         '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/cryptohome_client_stub.cc',
-        'dbus/cryptohome_client_stub.h',
         'dbus/dbus_client_implementation_type.h',
         '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/fake_bluetooth_adapter_client.cc',
         'dbus/fake_bluetooth_adapter_client.h',
         'dbus/fake_bluetooth_agent_manager_client.cc',
         'dbus/fake_bluetooth_agent_manager_client.h',
         'dbus/fake_bluetooth_agent_service_provider.cc',
         'dbus/fake_bluetooth_agent_service_provider.h',
         'dbus/fake_bluetooth_device_client.cc',
         'dbus/fake_bluetooth_device_client.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_gsm_sms_client.cc',
         'dbus/fake_gsm_sms_client.h',
         'dbus/fake_image_burner_client.cc',
         'dbus/fake_image_burner_client.h',
         'dbus/fake_system_clock_client.cc',
         'dbus/fake_system_clock_client.h',
         'dbus/gsm_sms_client.cc',
         'dbus/gsm_sms_client.h',
         'dbus/shill_client_helper.cc',
         'dbus/shill_client_helper.h',
@@ skipping 282 matching lines @@
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
         'chromeos',
         'power_manager_proto',
       ],
       'sources': [
         'dbus/fake_cros_disks_client.cc',
         'dbus/fake_cros_disks_client.h',
         'dbus/fake_cryptohome_client.cc',
         'dbus/fake_cryptohome_client.h',

[hashimoto, 2013/09/26 08:41:29]

Do we need these?

[satorux1, 2013/09/26 09:58:36]

I think so. These are used with MockDBusThreadManagerWithoutGMock

[hashimoto, 2013/09/27 04:07:11]

You added fake_cryptohome_client.cc/h to the target 'chromeos' and this
'chromeos_test_support_without_gmock' target has a dependency to 'chromeos'.
I thought we could remove fake_cryptohome_client.cc/h from this target.
Doesn't this work?

[satorux1, 2013/09/27 04:12:37]

Good point. Removed. Removed some other stuff too.

         '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_power_manager_client.cc',
         'dbus/fake_power_manager_client.h',
         'dbus/fake_session_manager_client.cc',
         'dbus/fake_session_manager_client.h',
         'dbus/fake_shill_device_client.cc',
         'dbus/fake_shill_device_client.h',
@@ skipping 136 matching lines @@
         '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
         'proto_out_dir': 'chromeos/dbus/power_manager',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }