Merge CrosDisksClientStubImpl into FakeCrosDisksClient

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,
     # These files lists are shared with the GN build.
     'chromeos_sources': [
       'accelerometer/accelerometer_reader.cc',
@@ skipping 104 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_cras_audio_client.cc',
       'dbus/fake_cras_audio_client.h',
+      'dbus/fake_cros_disks_client.cc',
+      'dbus/fake_cros_disks_client.h',
       'dbus/fake_cryptohome_client.cc',
       'dbus/fake_cryptohome_client.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',
@@ skipping 432 matching lines @@
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../crypto/crypto.gyp:crypto',
         '../dbus/dbus.gyp:dbus',
         'chromeos',
         'cryptohome_proto',
         'power_manager_proto',
       ],
       # If you edit the file list of this target, please edit BUILD.gn as well.
       'sources': [
-        'dbus/fake_cros_disks_client.cc',
-        'dbus/fake_cros_disks_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_manager_client.cc',
         'dbus/fake_shill_manager_client.h',
         'dbus/fake_update_engine_client.cc',
         'dbus/fake_update_engine_client.h',
         'ime/fake_input_method_delegate.cc',
         'ime/fake_input_method_delegate.h',
@@ skipping 85 matching lines @@
         '../third_party/cros_system_api/dbus/cryptohome/signed_secret.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/cryptohome',
         'proto_out_dir': 'chromeos/cryptohome',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }