Revert 197865 "dbus: Use fakes for some clients and utils for Mo..."

trunk/src/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 316 matching lines @@
       ],
       'sources': [
         'attestation/mock_attestation_flow.cc',
         'attestation/mock_attestation_flow.h',
         'chromeos_test_utils.cc',
         'chromeos_test_utils.h',
         'cryptohome/mock_async_method_caller.cc',
         'cryptohome/mock_async_method_caller.h',
         'cryptohome/mock_cryptohome_library.cc',
         'cryptohome/mock_cryptohome_library.h',
+        'dbus/fake_session_manager_client.cc',
+        'dbus/fake_session_manager_client.h',
+        'dbus/fake_update_engine_client.cc',
+        'dbus/fake_update_engine_client.h',
         'dbus/mock_bluetooth_adapter_client.cc',
         'dbus/mock_bluetooth_adapter_client.h',
         'dbus/mock_bluetooth_device_client.cc',
         'dbus/mock_bluetooth_device_client.h',
         'dbus/mock_bluetooth_input_client.cc',
         'dbus/mock_bluetooth_input_client.h',
         'dbus/mock_bluetooth_manager_client.cc',
         'dbus/mock_bluetooth_manager_client.h',
         'dbus/mock_bluetooth_node_client.cc',
         'dbus/mock_bluetooth_node_client.h',
@@ skipping 61 matching lines @@
         'dbus/fake_image_burner_client.cc',
         'dbus/fake_image_burner_client.h',
         'dbus/fake_old_bluetooth_adapter_client.cc',
         'dbus/fake_old_bluetooth_adapter_client.h',
         'dbus/fake_old_bluetooth_device_client.cc',
         'dbus/fake_old_bluetooth_device_client.h',
         'dbus/fake_old_bluetooth_manager_client.cc',
         'dbus/fake_old_bluetooth_manager_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_system_clock_client.cc',
         'dbus/fake_system_clock_client.h',
-        'dbus/fake_update_engine_client.cc',
-        'dbus/fake_update_engine_client.h',
         'dbus/mock_dbus_thread_manager_without_gmock.cc',
         'dbus/mock_dbus_thread_manager_without_gmock.h',
         'dbus/ibus/mock_ibus_client.cc',
         'dbus/ibus/mock_ibus_client.h',
         'dbus/ibus/mock_ibus_config_client.cc',
         'dbus/ibus/mock_ibus_config_client.h',
         'dbus/ibus/mock_ibus_input_context_client.cc',
         'dbus/ibus/mock_ibus_input_context_client.h',
         'dbus/ibus/mock_ibus_engine_factory_service.cc',
         'dbus/ibus/mock_ibus_engine_factory_service.h',
@@ skipping 122 matching lines @@
         '../third_party/cros_system_api/dbus/video_activity_update.proto',
       ],
       'variables': {
         'proto_in_dir': '../third_party/cros_system_api/dbus/',
         'proto_out_dir': 'chromeos/dbus',
       },
       'includes': ['../build/protoc.gypi'],
     },
   ],
 }