Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index cc07d2810bda708f1e0c5cf6c7cfa9d5e516d472..a260ba1a0e0e8d6df9975d9c7894927f510a7ae1 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -470,59 +470,12 @@
         'browser/chromeos/cryptohome/async_method_caller.h',
         'browser/chromeos/customization_document.cc',
         'browser/chromeos/customization_document.h',
-        'browser/chromeos/dbus/blocking_method_caller.cc',
-        'browser/chromeos/dbus/blocking_method_caller.h',
-        'browser/chromeos/dbus/bluetooth_adapter_client.cc',
-        'browser/chromeos/dbus/bluetooth_adapter_client.h',
-        'browser/chromeos/dbus/bluetooth_agent_service_provider.cc',
-        'browser/chromeos/dbus/bluetooth_agent_service_provider.h',
-        'browser/chromeos/dbus/bluetooth_device_client.cc',
-        'browser/chromeos/dbus/bluetooth_device_client.h',
-        'browser/chromeos/dbus/bluetooth_input_client.cc',
-        'browser/chromeos/dbus/bluetooth_input_client.h',
-        'browser/chromeos/dbus/bluetooth_manager_client.cc',
-        'browser/chromeos/dbus/bluetooth_manager_client.h',
-        'browser/chromeos/dbus/bluetooth_node_client.cc',
-        'browser/chromeos/dbus/bluetooth_node_client.h',
-        'browser/chromeos/dbus/bluetooth_property.cc',
-        'browser/chromeos/dbus/bluetooth_property.h',
-        'browser/chromeos/dbus/cashew_client.cc',
-        'browser/chromeos/dbus/cashew_client.h',
-        'browser/chromeos/dbus/cros_disks_client.cc',
-        'browser/chromeos/dbus/cros_disks_client.h',
-        'browser/chromeos/dbus/cryptohome_client.cc',
-        'browser/chromeos/dbus/cryptohome_client.h',
         'browser/chromeos/dbus/cros_dbus_service.cc',
         'browser/chromeos/dbus/cros_dbus_service.h',
-        'browser/chromeos/dbus/dbus_client_implementation_type.h',
-        'browser/chromeos/dbus/dbus_thread_manager.cc',
-        'browser/chromeos/dbus/dbus_thread_manager.h',
-        'browser/chromeos/dbus/debug_daemon_client.cc',
-        'browser/chromeos/dbus/debug_daemon_client.h',
-        'browser/chromeos/dbus/flimflam_ipconfig_client.cc',
-        'browser/chromeos/dbus/flimflam_ipconfig_client.h',
-        'browser/chromeos/dbus/flimflam_client_helper.cc',
-        'browser/chromeos/dbus/flimflam_client_helper.h',
-        'browser/chromeos/dbus/flimflam_network_client.cc',
-        'browser/chromeos/dbus/flimflam_network_client.h',
-        'browser/chromeos/dbus/flimflam_profile_client.cc',
-        'browser/chromeos/dbus/flimflam_profile_client.h',
-        'browser/chromeos/dbus/image_burner_client.cc',
-        'browser/chromeos/dbus/image_burner_client.h',
-        'browser/chromeos/dbus/introspectable_client.cc',
-        'browser/chromeos/dbus/introspectable_client.h',
         'browser/chromeos/dbus/introspect_util.cc',
         'browser/chromeos/dbus/introspect_util.h',
-        'browser/chromeos/dbus/power_manager_client.cc',
-        'browser/chromeos/dbus/power_manager_client.h',
         'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
         'browser/chromeos/dbus/proxy_resolution_service_provider.h',
-        'browser/chromeos/dbus/session_manager_client.cc',
-        'browser/chromeos/dbus/session_manager_client.h',
-        'browser/chromeos/dbus/speech_synthesizer_client.cc',
-        'browser/chromeos/dbus/speech_synthesizer_client.h',
-        'browser/chromeos/dbus/update_engine_client.cc',
-        'browser/chromeos/dbus/update_engine_client.h',
         'browser/chromeos/disks/disk_mount_manager.cc',
         'browser/chromeos/disks/disk_mount_manager.h',
         'browser/chromeos/enrollment_dialog_view.cc',
@@ -4224,8 +4177,6 @@
             '../third_party/libevent/libevent.gyp:libevent',
             '../third_party/mozc/chrome/chromeos/renderer/chromeos_renderer.gyp:mozc_candidates_proto',
             'browser/chromeos/input_method/input_method.gyp:gencode',
-            'power_supply_properties_proto',
-            'power_state_control_proto',
           ],
           'sources!': [
             'browser/first_run/upgrade_util.cc',
@@ -5284,41 +5235,5 @@
       },
       'includes': [ '../build/protoc.gypi' ]
     },
-    {
-      # Protobuf compiler / generator for the PowerSupplyProperties protocol
-      # buffer.
-      'target_name': 'power_supply_properties_proto',
-      'type': 'static_library',
-      'conditions': [
-        ['chromeos==1', {
-         'sources': [
-           '../third_party/cros_system_api/dbus/power_supply_properties.proto',
-         ],
-         'variables': {
-          'proto_in_dir': '../third_party/cros_system_api/dbus/',
-          'proto_out_dir': 'chrome/browser/chromeos/dbus',
-         },
-         'includes': ['../build/protoc.gypi'],
-        }],
-      ],
-    },
-    {
-      # Protobuf compiler / generator for the PowerSupplyProperties protocol
-      # buffer.
-      'target_name': 'power_state_control_proto',
-      'type': 'static_library',
-      'conditions': [
-        ['chromeos==1', {
-         'sources': [
-           '../third_party/cros_system_api/dbus/power_state_control.proto',
-         ],
-         'variables': {
-          'proto_in_dir': '../third_party/cros_system_api/dbus/',
-          'proto_out_dir': 'chrome/browser/chromeos/dbus',
-         },
-         'includes': ['../build/protoc.gypi'],
-        }],
-      ],
-    },
   ],
 }