• Home
  • History
  • Annotate
  • only in /external/chromium_org/chromeos/
History log of /external/chromium_org/chromeos/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e4256316f8b5e8d1ec0df1f7762771622a53fa63 22-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: I1bb301dcfe74249d8b66fb60ba577e9095c86b8d
me/component_extension_ime_manager.cc
me/component_extension_ime_manager_unittest.cc
29b820f8d84e3bc97d62552e54923c42407f2f29 12-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.59

This commit was generated by merge_to_master.py.

Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
hromeos.gyp
ogin/auth/extended_authenticator.cc
ogin/auth/extended_authenticator.h
ogin/auth/extended_authenticator_impl.cc
ogin/auth/extended_authenticator_impl.h
ogin/auth/fake_extended_authenticator.cc
ogin/auth/fake_extended_authenticator.h
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
hromeos_switches.cc
hromeos_switches.h
ogin/login_state.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
HROMEOS_LKGM
EPS
ccelerometer/accelerometer_reader.cc
ccelerometer/accelerometer_reader.h
udio/audio_device.cc
udio/audio_device.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
ert_loader.cc
ert_loader_unittest.cc
hromeos.gyp
hromeos_paths.cc
hromeos_switches.cc
hromeos_switches.h
hromeos_test_utils.cc
ryptohome/OWNERS
ryptohome/cryptohome_parameters.cc
ryptohome/cryptohome_parameters.h
ryptohome/homedir_methods.cc
ryptohome/homedir_methods.h
ryptohome/homedir_methods_unittest.cc
ryptohome/mock_homedir_methods.cc
ryptohome/mock_homedir_methods.h
ryptohome/system_salt_getter_unittest.cc
bus/OWNERS
bus/blocking_method_caller_unittest.cc
bus/bluetooth_adapter_client.cc
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_device_client.cc
bus/bluetooth_gatt_characteristic_service_provider.cc
bus/bluetooth_gatt_descriptor_service_provider.cc
bus/bluetooth_gatt_service_service_provider.cc
bus/bluetooth_input_client.cc
bus/bluetooth_profile_service_provider.cc
bus/cras_audio_client.h
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/cros_disks_client.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_client.h
bus/dbus_client_bundle.cc
bus/dbus_client_bundle.h
bus/dbus_client_bundle_unittest.cc
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/easy_unlock_client.cc
bus/easy_unlock_client.h
bus/fake_bluetooth_gatt_descriptor_client.cc
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_easy_unlock_client.cc
bus/fake_easy_unlock_client.h
bus/fake_easy_unlock_client_unittest.cc
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/mock_cryptohome_client.h
bus/mock_shill_manager_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller_unittest.cc
bus/session_manager_client.cc
bus/shill_client_unittest_base.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/update_engine_client.cc
isks/disk_mount_manager_unittest.cc
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/mock_component_extension_ime_manager_delegate.cc
me/mock_component_extension_ime_manager_delegate.h
ogin/auth/cryptohome_authenticator.cc
ogin/auth/cryptohome_authenticator.h
ogin/auth/extended_authenticator.cc
ogin/auth/key.cc
ogin/auth/key.h
ogin/auth/key_unittest.cc
ogin/auth/online_attempt.cc
ogin/auth/online_attempt.h
ogin/auth/user_context.h
etwork/client_cert_resolver.cc
etwork/client_cert_resolver_unittest.cc
etwork/geolocation_handler_unittest.cc
etwork/host_resolver_impl_chromeos_unittest.cc
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/network_cert_migrator.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler_unittest.cc
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler_unittest.cc
etwork/network_util.cc
etwork/onc/mock_certificate_importer.cc
etwork/onc/mock_certificate_importer.h
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_impl.cc
etwork/onc/onc_certificate_importer_impl.h
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_merger.cc
etwork/onc/onc_merger_unittest.cc
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_test_utils.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translation_tables.h
etwork/onc/onc_translator.h
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_applicator.h
etwork/policy_util.cc
etwork/policy_util.h
etwork/shill_property_handler_unittest.cc
rocess_proxy/process_output_watcher_unittest.cc
rocess_proxy/process_proxy.cc
ettings/timezone_settings.cc
ystem/name_value_pairs_parser.cc
est/data/network/augmented_merge.json
est/data/network/cellular.onc
est/data/network/device_policy.onc
est/data/network/ethernet.onc
est/data/network/invalid_settings_with_repairs.json
est/data/network/managed_toplevel1.onc
est/data/network/managed_vpn.onc
est/data/network/managed_vpn_without_recommended.onc
est/data/network/policy/managed_onc_disallow_autoconnect_on_unmanaged_wifi2.onc
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/shill_cellular.json
est/data/network/shill_cellular_with_state.json
est/data/network/shill_ethernet.json
est/data/network/shill_ethernet_with_ipconfig.json
est/data/network/shill_wifi_with_state.json
est/data/network/shill_wimax.json
est/data/network/shill_wimax_with_state.json
est/data/network/toplevel_partially_invalid.onc
est/data/network/translation_of_shill_cellular_with_state.onc
est/data/network/translation_of_shill_ethernet.onc
est/data/network/translation_of_shill_ethernet_with_ipconfig.onc
est/data/network/translation_of_shill_l2tpipsec.onc
est/data/network/translation_of_shill_wifi_clientcert.onc
est/data/network/translation_of_shill_wifi_with_state.onc
est/data/network/translation_of_shill_wimax_with_state.onc
est/data/network/user.onc
est/data/network/vpn_active_settings.onc
est/data/network/wimax.onc
pm_password_fetcher.cc
pm_password_fetcher.h
pm_token_loader.cc
pm_token_loader.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
HROMEOS_LKGM
hromeos.gyp
bus/OWNERS
bus/cryptohome_client.cc
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_manager_client.cc
bus/power_manager_client.cc
bus/power_manager_client.h
bus/session_manager_client.cc
bus/session_manager_client.h
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/input_method_manager.cc
me/input_method_manager.h
me/mock_component_extension_ime_manager_delegate.cc
me/mock_component_extension_ime_manager_delegate.h
ogin/auth/cryptohome_authenticator.cc
ogin/auth/cryptohome_authenticator.h
ogin/auth/mock_url_fetchers.cc
ogin/auth/mock_url_fetchers.h
ogin/auth/online_attempt.cc
ogin/auth/online_attempt.h
ogin/auth/online_attempt_host.cc
ogin/auth/online_attempt_host.h
ogin_event_recorder.cc
ogin_event_recorder.h
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/network_cert_migrator.cc
etwork/network_cert_migrator.h
etwork/network_cert_migrator_unittest.cc
etwork/onc/onc_merger.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translation_tables.h
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
est/data/network/shill_openvpn_with_errors.json
est/data/network/shill_output_l2tpipsec.json
est/data/network/shill_output_openvpn.json
est/data/network/shill_output_openvpn_with_errors.json
est/data/network/shill_wifi_with_state.json
est/data/network/translation_of_shill_l2tpipsec.onc
est/data/network/translation_of_shill_wifi_with_state.onc
pm_password_fetcher.cc
pm_password_fetcher.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
HROMEOS_LKGM
udio/chromeos_sounds.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/system_salt_getter.cc
bus/OWNERS
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_gatt_characteristic_service_provider.cc
bus/bluetooth_gatt_descriptor_service_provider.cc
bus/bluetooth_gatt_service_service_provider.cc
bus/bluetooth_profile_service_provider.cc
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/dbus_client_bundle.cc
bus/dbus_client_bundle.h
bus/dbus_client_bundle_unittest.cc
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/dbus_thread_manager_observer.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_shill_manager_client.cc
bus/permission_broker_client.h
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/extension_ime_util.cc
me/extension_ime_util_unittest.cc
me/input_method_manager.h
ogin/auth/extended_authenticator.cc
ogin/auth/key.cc
ogin/login_state.cc
ogin/login_state.h
etwork/network_connection_handler.cc
etwork/network_connection_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/onc/onc_certificate_importer_impl.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
ystem/statistics_provider.cc
est/data/network/shill_cellular_with_state.json
est/data/network/translation_of_shill_cellular_with_state.onc
pm_token_loader.cc
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
HROMEOS_LKGM
udio/audio_device.cc
udio/audio_device.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
ert_loader.cc
ert_loader.h
ert_loader_unittest.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_gatt_characteristic_client.cc
bus/bluetooth_gatt_characteristic_client.h
bus/bluetooth_gatt_service_client.cc
bus/bluetooth_gatt_service_client.h
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cros_disks_client_unittest.cc
bus/cryptohome_client.h
bus/dbus_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/easy_unlock_client.cc
bus/easy_unlock_client.h
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_service_client.cc
bus/fake_cryptohome_client.cc
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_debug_daemon_client.cc
bus/fake_debug_daemon_client.h
bus/fake_easy_unlock_client.cc
bus/fake_easy_unlock_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_service_client_unittest.cc
isks/disk_mount_manager.cc
isks/disk_mount_manager.h
isks/disk_mount_manager_unittest.cc
isks/mock_disk_mount_manager.cc
isks/mock_disk_mount_manager.h
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/extension_ime_util.cc
me/extension_ime_util.h
me/ime_keyboard_x11.cc
me/input_method_manager.h
ogin/auth/auth_attempt_state.cc
ogin/auth/auth_attempt_state.h
ogin/auth/auth_attempt_state_resolver.cc
ogin/auth/auth_attempt_state_resolver.h
ogin/auth/authenticator.cc
ogin/auth/authenticator.h
ogin/auth/extended_authenticator.cc
ogin/auth/extended_authenticator.h
ogin/auth/mock_auth_attempt_state_resolver.cc
ogin/auth/mock_auth_attempt_state_resolver.h
ogin/auth/mock_authenticator.cc
ogin/auth/mock_authenticator.h
ogin/auth/test_attempt_state.cc
ogin/auth/test_attempt_state.h
ogin/auth/user_context.cc
ogin/auth/user_context.h
ogin/login_state.cc
ogin/login_state.h
ogin/user_names.cc
ogin/user_names.h
ogin_event_recorder.cc
ogin_event_recorder.h
etwork/client_cert_resolver.cc
etwork/client_cert_resolver.h
etwork/client_cert_resolver_unittest.cc
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/device_state.cc
etwork/host_resolver_impl_chromeos.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler_unittest.cc
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/portal_detector/network_portal_detector_strategy.cc
etwork/portal_detector/network_portal_detector_strategy.h
etwork/shill_property_handler_unittest.cc
airing/OWNERS
airing/controller_pairing_controller.cc
airing/controller_pairing_controller.h
airing/fake_controller_pairing_controller.cc
airing/fake_controller_pairing_controller.h
airing/fake_host_pairing_controller.cc
airing/fake_host_pairing_controller.h
airing/host_pairing_controller.cc
airing/host_pairing_controller.h
rocess_proxy/process_output_watcher_unittest.cc
ettings/cros_settings_names.cc
ettings/cros_settings_names.h
est/data/network/shill_cellular_with_state.json
est/data/network/translation_of_shill_cellular_with_state.onc
pm_token_loader.cc
pm_token_loader.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_gatt_characteristic_client.cc
bus/bluetooth_gatt_characteristic_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_characteristic_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/gsm_sms_client_unittest.cc
bus/lorgnette_manager_client.cc
bus/lorgnette_manager_client.h
bus/mock_cryptohome_client.h
bus/session_manager_client.cc
bus/shill_client_unittest_base.cc
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client_unittest.cc
bus/shill_profile_client_unittest.cc
bus/shill_service_client.h
bus/system_clock_client.cc
isks/disk_mount_manager.cc
isks/disk_mount_manager.h
isks/mock_disk_mount_manager.cc
isks/mock_disk_mount_manager.h
ogin/DEPS
ogin/OWNERS
ogin/auth/auth_status_consumer.cc
ogin/auth/auth_status_consumer.h
ogin/auth/key.cc
ogin/auth/key.h
ogin/auth/key_unittest.cc
ogin/auth/mock_auth_status_consumer.cc
ogin/auth/mock_auth_status_consumer.h
ogin/auth/user_context.cc
ogin/auth/user_context.h
ogin/login_state.cc
ogin/login_state.h
ogin/user_names.cc
ogin/user_names.h
etwork/certificate_pattern.cc
etwork/certificate_pattern.h
etwork/client_cert_resolver.cc
etwork/client_cert_resolver_unittest.cc
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/host_resolver_impl_chromeos.cc
etwork/host_resolver_impl_chromeos_unittest.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.cc
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/network_ui_data.cc
etwork/network_ui_data.h
etwork/network_ui_data_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_util.cc
etwork/portal_detector/OWNERS
etwork/portal_detector/network_portal_detector.cc
etwork/portal_detector/network_portal_detector.h
etwork/portal_detector/network_portal_detector_strategy.cc
etwork/portal_detector/network_portal_detector_strategy.h
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
airing/controller_pairing_controller.cc
airing/controller_pairing_controller.h
airing/controller_pairing_flow.cc
airing/controller_pairing_flow.h
airing/fake_controller_pairing_controller.cc
airing/fake_controller_pairing_controller.h
airing/fake_controller_pairing_flow.cc
airing/fake_controller_pairing_flow.h
airing/fake_host_pairing_controller.cc
airing/fake_host_pairing_controller.h
airing/host_pairing_controller.cc
airing/host_pairing_controller.h
ystem/name_value_pairs_parser.cc
ystem/statistics_provider.cc
est/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json
est/data/network/toplevel_empty.onc
est/data/network/toplevel_only_global_config.onc
est/data/network/uidata_for_l2tpipsec_clientcert.json
est/data/network/uidata_for_openvpn_clientcert.json
est/data/network/uidata_for_wifi_clientcert.json
est/data/network/uidata_for_wifi_clientref.json
est/data/network/uidata_for_wifi_psk.json
pm_token_loader.cc
pm_token_loader.h
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
HROMEOS_LKGM
hromeos.gyp
hromeos_paths.cc
hromeos_paths.h
bus/fake_bluetooth_device_client.cc
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_profile_client.cc
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/shill_manager_client.h
bus/shill_service_client.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
airing/controller_pairing_flow.h
airing/fake_controller_pairing_flow.cc
airing/fake_controller_pairing_flow.h
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
UILD.gn
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_gatt_characteristic_client.cc
bus/bluetooth_gatt_characteristic_client.h
bus/bluetooth_gatt_descriptor_client.cc
bus/bluetooth_gatt_descriptor_client.h
bus/bluetooth_gatt_service_client.cc
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_characteristic_client.h
bus/fake_bluetooth_gatt_descriptor_client.cc
bus/fake_bluetooth_gatt_descriptor_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_profile_client.cc
bus/fake_shill_service_client.cc
bus/shill_manager_client.h
me/extension_ime_util.h
me/fake_ime_keyboard.cc
me/fake_ime_keyboard.h
me/ime_keyboard_x11_unittest.cc
me/input_method_manager.h
ogin/login_state.cc
ogin/login_state.h
ogin/login_state_unittest.cc
etwork/client_cert_resolver.cc
etwork/client_cert_resolver.h
etwork/client_cert_resolver_unittest.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/host_resolver_impl_chromeos.cc
etwork/host_resolver_impl_chromeos.h
etwork/host_resolver_impl_chromeos_unittest.cc
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_cert_migrator.cc
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_handler.cc
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.cc
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
est/data/network/policy/policy_vpn.onc
est/data/network/policy/shill_managed_vpn.json
est/data/network/policy/shill_policy_on_managed_vpn.json
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
HROMEOS_LKGM
hromeos.gyp
bus/fake_shill_device_client.cc
bus/fake_shill_device_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_profile_client.cc
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/shill_device_client.h
bus/shill_manager_client.h
bus/shill_service_client.h
bus/update_engine_client.cc
bus/update_engine_client.h
me/extension_ime_util.cc
me/extension_ime_util.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_methods.txt
etwork/client_cert_resolver_unittest.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_change_notifier_chromeos.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_merger.cc
etwork/onc/onc_merger_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
airing/OWNERS
airing/controller_pairing_flow.cc
airing/controller_pairing_flow.h
est/data/network/augmented_merge.json
est/data/network/vpn_active_settings.onc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
HROMEOS_LKGM
ttestation/OWNERS
udio/cras_audio_handler.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/OWNERS
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_profile_manager_client.cc
bus/bluetooth_profile_manager_client.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/dbus_thread_manager.cc
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_profile_manager_client.cc
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_debug_daemon_client.cc
bus/fake_debug_daemon_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_profile_client.cc
bus/fake_shill_profile_client.h
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/nfc_client_helpers.cc
bus/nfc_client_helpers.h
bus/nfc_device_client.cc
bus/nfc_tag_client.cc
bus/shill_manager_client.h
bus/shill_profile_client.h
bus/shill_service_client.h
isks/disk_mount_manager.cc
etwork/client_cert_resolver.cc
etwork/client_cert_resolver_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_configuration_handler.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler_impl.cc
etwork/network_handler.cc
etwork/network_policy_observer.h
etwork/network_profile_handler.h
etwork/network_sms_handler.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/network_type_pattern.cc
etwork/network_type_pattern.h
etwork/network_type_pattern_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translation_tables.h
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/policy_applicator.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
etwork/shill_property_util_unittest.cc
rocess_proxy/process_output_watcher.cc
rocess_proxy/process_output_watcher.h
rocess_proxy/process_output_watcher_unittest.cc
rocess_proxy/process_proxy_unittest.cc
ystem/name_value_pairs_parser.cc
ystem/statistics_provider.cc
ystem/statistics_provider.h
est/data/network/policy/shill_managed_wifi1_rsn.json
est/data/network/shill_cellular_with_state.json
est/data/network/translation_of_shill_cellular_with_state.onc
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
EPS
hromeos.gyp
hromeos_paths.cc
hromeos_paths.h
hromeos_switches.cc
hromeos_switches.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/debug_daemon_client.cc
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_cryptohome_client.cc
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_ipconfig_client.cc
bus/fake_shill_ipconfig_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_service_client.cc
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/mock_session_manager_client.h
bus/pipe_reader.cc
bus/pipe_reader.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
isks/disk_mount_manager.cc
isks/disk_mount_manager_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/mock_managed_network_configuration_handler.h
etwork/network_connection_handler.cc
etwork/network_device_handler_impl.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
ystem/statistics_provider.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
HROMEOS_LKGM
hromeos_switches.cc
hromeos_switches.h
bus/debug_daemon_client.cc
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_system_clock_client.cc
bus/fake_system_clock_client.h
bus/mock_session_manager_client.h
bus/pipe_reader.cc
bus/pipe_reader.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/system_clock_client.cc
bus/system_clock_client.h
etwork/favorite_state.cc
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_ui_data.cc
etwork/network_ui_data.h
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_validator_unittest.cc
est/data/network/shill_ethernet_with_ipconfig.json
est/data/network/translation_of_shill_ethernet_with_ipconfig.onc
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
HROMEOS_LKGM
udio/cras_audio_handler.cc
udio/cras_audio_handler_unittest.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/homedir_methods.cc
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_lorgnette_manager_client.cc
bus/fake_lorgnette_manager_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/lorgnette_manager_client.cc
bus/lorgnette_manager_client.h
bus/pipe_reader.cc
bus/power_manager_client.cc
bus/power_manager_client.h
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
HROMEOS_LKGM
EPS
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_agent_service_provider.h
bus/bluetooth_profile_service_provider.cc
bus/bluetooth_profile_service_provider.h
bus/fake_bluetooth_agent_service_provider.cc
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_characteristic_client.h
bus/fake_bluetooth_gatt_descriptor_client.cc
bus/fake_bluetooth_gatt_descriptor_client.h
bus/fake_bluetooth_gatt_service_client.cc
bus/fake_bluetooth_gatt_service_client.h
bus/fake_bluetooth_profile_service_provider.cc
me/fake_ime_keyboard.cc
me/fake_ime_keyboard.h
me/fake_xkeyboard.cc
me/fake_xkeyboard.h
me/ime_keyboard.h
me/ime_keyboard_ozone.cc
me/ime_keyboard_x11.cc
me/ime_keyboard_x11_unittest.cc
me/input_method_manager.h
me/xkeyboard.cc
me/xkeyboard.h
me/xkeyboard_unittest.cc
ogin/login_state.cc
ogin/login_state.h
etwork/network_connection_handler.cc
rocess_proxy/process_proxy.cc
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
HROMEOS_LKGM
EPS
ccelerometer/accelerometer_reader.cc
ccelerometer/accelerometer_reader.h
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/mock_homedir_methods.cc
ryptohome/mock_homedir_methods.h
bus/bluetooth_gatt_service_client.cc
bus/bluetooth_gatt_service_client.h
bus/debug_daemon_client.cc
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_service_client.cc
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/pipe_reader.cc
bus/pipe_reader.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
HROMEOS_LKGM
hromeos.gyp
hromeos_memory.gypi
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_gatt_characteristic_service_provider.cc
bus/bluetooth_gatt_characteristic_service_provider.h
bus/bluetooth_gatt_descriptor_service_provider.cc
bus/bluetooth_gatt_descriptor_service_provider.h
bus/bluetooth_gatt_manager_client.cc
bus/bluetooth_gatt_manager_client.h
bus/bluetooth_gatt_service_service_provider.cc
bus/bluetooth_gatt_service_service_provider.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_bluetooth_gatt_characteristic_service_provider.cc
bus/fake_bluetooth_gatt_characteristic_service_provider.h
bus/fake_bluetooth_gatt_descriptor_service_provider.cc
bus/fake_bluetooth_gatt_descriptor_service_provider.h
bus/fake_bluetooth_gatt_manager_client.cc
bus/fake_bluetooth_gatt_manager_client.h
bus/fake_bluetooth_gatt_service_service_provider.cc
bus/fake_bluetooth_gatt_service_service_provider.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_debug_daemon_client.cc
bus/fake_debug_daemon_client.h
emory/DEPS
emory/chromeos_memory_export.h
emory/low_memory_listener.cc
emory/low_memory_listener.h
emory/low_memory_listener_delegate.h
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/homedir_methods.cc
ryptohome/homedir_methods.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_gatt_characteristic_client.cc
bus/fake_bluetooth_gatt_characteristic_client.h
bus/fake_bluetooth_gatt_descriptor_client.cc
bus/fake_bluetooth_gatt_descriptor_client.h
bus/fake_bluetooth_gatt_service_client.cc
bus/fake_bluetooth_gatt_service_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/mock_cryptohome_client.h
bus/power_manager_client.cc
bus/update_engine_client.cc
bus/update_engine_client.h
isks/mock_disk_mount_manager.cc
isks/mock_disk_mount_manager.h
me/OWNERS
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/fake_xkeyboard.cc
me/fake_xkeyboard.h
me/input_method_manager.h
me/input_methods.txt
me/xkeyboard.cc
me/xkeyboard.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
ystem/name_value_pairs_parser.cc
ystem/statistics_provider.cc
ystem/statistics_provider.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/bluetooth_gatt_characteristic_client.cc
bus/bluetooth_gatt_characteristic_client.h
bus/bluetooth_gatt_descriptor_client.cc
bus/bluetooth_gatt_descriptor_client.h
bus/bluetooth_gatt_service_client.cc
bus/bluetooth_gatt_service_client.h
bus/power_manager_client.cc
me/extension_ime_util.cc
me/xkeyboard.cc
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_state.cc
etwork/network_state.h
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
HROMEOS_LKGM
EPS
ttestation/attestation_constants.h
ttestation/attestation_flow.cc
ttestation/attestation_flow.h
ttestation/attestation_flow_unittest.cc
ttestation/mock_attestation_flow.cc
ttestation/mock_attestation_flow.h
udio/chromeos_sounds.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
ert_loader.cc
ert_loader_unittest.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/cryptohome_parameters.cc
ryptohome/cryptohome_parameters.h
ryptohome/homedir_methods.cc
ryptohome/homedir_methods.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
ryptohome/mock_homedir_methods.cc
ryptohome/mock_homedir_methods.h
bus/OWNERS
bus/cros_disks_client.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_adapter_client.h
bus/fake_bluetooth_agent_manager_client.cc
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_input_client.cc
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/mock_cryptohome_client.h
bus/mock_session_manager_client.h
bus/nfc_client_unittest.cc
bus/power_policy_controller.cc
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_manager_client.h
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_stub_helper.cc
bus/shill_stub_helper.h
bus/sms_client.cc
isplay/OWNERS
isplay/native_display_delegate_x11.cc
isplay/native_display_delegate_x11.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/output_util_unittest.cc
isplay/touchscreen_delegate_x11.cc
isplay/touchscreen_delegate_x11.h
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/extension_ime_util.cc
me/extension_ime_util.h
me/fake_xkeyboard.cc
me/fake_xkeyboard.h
me/ibus_keymap.cc
me/ibus_keymap.h
me/input_method_manager.h
me/input_method_property.cc
me/input_method_property.h
me/input_method_property_unittest.cc
me/mock_component_extension_ime_manager_delegate.cc
me/mock_component_extension_ime_manager_delegate.h
me/xkeyboard.cc
me/xkeyboard.h
me/xkeyboard_unittest.cc
etwork/favorite_state.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_event_log.cc
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_certificate_importer_impl.cc
etwork/policy_applicator.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
rocess_proxy/process_output_watcher_unittest.cc
rocess_proxy/process_proxy.cc
ettings/cros_settings_names.cc
ettings/cros_settings_names.h
ettings/timezone_settings.cc
ystem/name_value_pairs_parser.cc
ystem/statistics_provider.cc
ystem/statistics_provider.h
pm_token_loader.cc
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
HROMEOS_LKGM
EPS
udio/chromeos_sounds.h
udio/cras_audio_handler.cc
udio/cras_audio_handler_unittest.cc
ert_loader.cc
ert_loader.h
ert_loader_unittest.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_modem_messaging_client.cc
bus/fake_nfc_adapter_client.cc
bus/fake_nfc_adapter_client.h
bus/fake_nfc_device_client.cc
bus/fake_nfc_device_client.h
bus/fake_nfc_record_client.cc
bus/fake_nfc_record_client.h
bus/fake_nfc_tag_client.cc
bus/fake_nfc_tag_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_device_client.h
bus/fake_shill_manager_client.cc
bus/mock_session_manager_client.h
bus/nfc_client_helpers.cc
bus/nfc_device_client.cc
bus/nfc_device_client.h
bus/nfc_property_set.h
bus/nfc_record_client.cc
bus/nfc_record_client.h
bus/nfc_tag_client.cc
bus/nfc_tag_client.h
bus/power_manager_client.cc
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_stub_helper.cc
isplay/native_display_delegate_x11.cc
isplay/native_display_delegate_x11.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
isplay/touchscreen_delegate_x11.cc
isplay/touchscreen_delegate_x11.h
me/candidate_window.cc
me/candidate_window.h
me/candidate_window_unittest.cc
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/composition_text.cc
me/composition_text.h
me/composition_text_unittest.cc
me/fake_input_method_delegate.cc
me/fake_input_method_delegate.h
me/fake_xkeyboard.cc
me/fake_xkeyboard.h
me/gen_input_methods.py
me/ibus_text.cc
me/ibus_text.h
me/ibus_text_unittest.cc
me/input_method_delegate.h
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_methods.txt
me/mock_xkeyboard.cc
me/mock_xkeyboard.h
me/xkeyboard.cc
me/xkeyboard.h
me/xkeyboard_unittest.cc
ogin/login_state.h
etwork/client_cert_resolver.cc
etwork/client_cert_resolver_unittest.cc
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/device_state.cc
etwork/device_state.h
etwork/fake_network_device_handler.cc
etwork/fake_network_device_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/network_cert_migrator.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler.cc
etwork/network_device_handler.h
etwork/network_device_handler_impl.cc
etwork/network_device_handler_impl.h
etwork/network_device_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_sms_handler.cc
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/network_util_unittest.cc
etwork/onc/onc_certificate_importer_impl.cc
etwork/onc/onc_certificate_importer_impl.h
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_applicator.h
etwork/shill_property_handler.cc
etwork/shill_property_util.cc
ettings/timezone_settings.cc
ettings/timezone_settings.h
est/data/network/augmented_merge.json
est/data/network/invalid_settings_with_repairs.json
est/data/network/l2tpipsec_clientcert_with_cert_pems.onc
est/data/network/managed_toplevel_l2tpipsec.onc
est/data/network/managed_vpn.onc
est/data/network/managed_vpn_without_recommended.onc
est/data/network/network_configs_with_resolved_certs.json
est/data/network/shill_l2tpipsec.json
est/data/network/shill_l2tpipsec_clientcert.json
est/data/network/translation_of_shill_l2tpipsec.onc
est/data/network/valid_l2tpipsec.onc
pm_token_loader.cc
pm_token_loader.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
HROMEOS_LKGM
hromeos.gyp
bus/bluetooth_adapter_client.cc
bus/bluetooth_adapter_client.h
bus/bluetooth_agent_manager_client.cc
bus/bluetooth_agent_manager_client.h
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_input_client.cc
bus/bluetooth_input_client.h
bus/bluetooth_profile_manager_client.cc
bus/bluetooth_profile_manager_client.h
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cros_disks_client.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_bluetooth_adapter_client.h
bus/fake_bluetooth_agent_manager_client.h
bus/fake_bluetooth_agent_service_provider.h
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_input_client.h
bus/fake_bluetooth_profile_manager_client.h
bus/fake_bluetooth_profile_service_provider.h
bus/fake_cros_disks_client.cc
bus/fake_dbus_thread_manager.cc
bus/fake_debug_daemon_client.cc
bus/fake_debug_daemon_client.h
bus/fake_introspectable_client.cc
bus/fake_introspectable_client.h
bus/fake_modem_messaging_client.cc
bus/fake_modem_messaging_client.h
bus/fake_nfc_adapter_client.cc
bus/fake_nfc_adapter_client.h
bus/fake_nfc_device_client.cc
bus/fake_nfc_device_client.h
bus/fake_nfc_tag_client.cc
bus/fake_nfc_tag_client.h
bus/fake_permission_broker_client.cc
bus/fake_permission_broker_client.h
bus/fake_session_manager_client.cc
bus/fake_shill_device_client.cc
bus/fake_sms_client.cc
bus/fake_sms_client.h
bus/gsm_sms_client.cc
bus/gsm_sms_client.h
bus/gsm_sms_client_unittest.cc
bus/image_burner_client.cc
bus/image_burner_client.h
bus/introspectable_client.cc
bus/introspectable_client.h
bus/modem_messaging_client.cc
bus/modem_messaging_client.h
bus/modem_messaging_client_unittest.cc
bus/nfc_adapter_client.cc
bus/nfc_adapter_client.h
bus/nfc_client_helpers.cc
bus/nfc_client_helpers.h
bus/nfc_client_unittest.cc
bus/nfc_device_client.cc
bus/nfc_device_client.h
bus/nfc_manager_client.cc
bus/nfc_manager_client.h
bus/nfc_property_set.cc
bus/nfc_property_set.h
bus/nfc_record_client.cc
bus/nfc_record_client.h
bus/nfc_tag_client.cc
bus/nfc_tag_client.h
bus/permission_broker_client.cc
bus/permission_broker_client.h
bus/session_manager_client.cc
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_profile_client_unittest.cc
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_unittest.cc
bus/sms_client.cc
bus/sms_client.h
bus/system_clock_client.cc
bus/system_clock_client.h
isks/disk_mount_manager.cc
me/candidate_window.cc
me/ibus_text.cc
me/ibus_text.h
me/ibus_text_unittest.cc
me/input_method_config.cc
me/input_method_config.h
me/input_method_descriptor.h
me/input_method_manager.h
me/input_methods.txt
me/xkeyboard.cc
etwork/network_connection_handler.cc
etwork/network_device_handler.cc
etwork/network_device_handler.h
etwork/network_device_handler_unittest.cc
etwork/network_sms_handler_unittest.cc
etwork/network_state_handler.cc
rocess_proxy/process_output_watcher.cc
rocess_proxy/process_output_watcher_unittest.cc
rocess_proxy/process_proxy.cc
rocess_proxy/process_proxy_unittest.cc
ettings/cros_settings_names.cc
ettings/cros_settings_names.h
ystem/name_value_pairs_parser.cc
ystem/statistics_provider.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
HROMEOS_LKGM
WNERS
ert_loader.cc
hromeos.gyp
hromeos_paths.cc
hromeos_paths.h
hromeos_switches.cc
hromeos_switches.h
ryptohome/system_salt_getter_unittest.cc
bus/dbus_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_nfc_record_client.cc
bus/fake_nfc_record_client.h
bus/fake_shill_service_client.cc
bus/ibus/OWNERS
bus/ibus/ibus_client.cc
bus/ibus/ibus_client.h
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_component.cc
bus/ibus/ibus_component.h
bus/ibus/ibus_component_unittest.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_factory_service.cc
bus/ibus/ibus_engine_factory_service.h
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_object.cc
bus/ibus/ibus_object.h
bus/ibus/ibus_object_unittest.cc
bus/ibus/ibus_text.cc
bus/ibus/ibus_text.h
bus/ibus/ibus_text_unittest.cc
bus/ibus/mock_ibus_client.cc
bus/ibus/mock_ibus_client.h
bus/ibus/mock_ibus_engine_factory_service.cc
bus/ibus/mock_ibus_engine_factory_service.h
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/mock_cryptohome_client.cc
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_shill_manager_client.cc
bus/mock_shill_profile_client.cc
bus/nfc_adapter_client.cc
bus/nfc_adapter_client.h
bus/nfc_client_helpers.cc
bus/nfc_client_helpers.h
bus/nfc_client_unittest.cc
bus/nfc_device_client.cc
bus/nfc_device_client.h
bus/nfc_record_client.cc
bus/nfc_record_client.h
bus/nfc_tag_client.cc
bus/nfc_tag_client.h
bus/power_manager_client.cc
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/update_engine_client.cc
isks/disk_mount_manager_unittest.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
me/OWNERS
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/extension_ime_util.cc
me/extension_ime_util.h
me/extension_ime_util_unittest.cc
me/ibus_bridge.cc
me/ibus_bridge.h
me/ibus_daemon_controller.cc
me/ibus_daemon_controller.h
me/ibus_text.cc
me/ibus_text.h
me/ibus_text_unittest.cc
me/ime_constants.h
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/mock_ibus_daemon_controller.cc
me/mock_ibus_daemon_controller.h
me/mock_ime_candidate_window_handler.cc
me/mock_ime_candidate_window_handler.h
me/mock_ime_engine_handler.cc
me/mock_ime_engine_handler.h
me/mock_ime_input_context_handler.cc
me/mock_ime_input_context_handler.h
me/mock_ime_property_handler.cc
me/mock_ime_property_handler.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_state_handler.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_applicator.h
etwork/shill_property_handler.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
est/data/network/invalid_settings_with_repairs.json
est/data/network/shill_openvpn.json
est/data/network/translation_of_shill_openvpn.onc
est/data/network/valid_openvpn_with_cert_pems.onc
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_nfc_adapter_client.cc
bus/fake_nfc_adapter_client.h
bus/fake_nfc_device_client.cc
bus/fake_nfc_device_client.h
bus/fake_nfc_tag_client.cc
bus/fake_nfc_tag_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/nfc_adapter_client.cc
bus/nfc_client_helpers.cc
bus/nfc_client_helpers.h
bus/nfc_client_unittest.cc
bus/nfc_device_client.cc
bus/nfc_device_client.h
bus/nfc_tag_client.cc
bus/nfc_tag_client.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
HROMEOS_LKGM
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/system_salt_getter.cc
ryptohome/system_salt_getter.h
ryptohome/system_salt_getter_unittest.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_nfc_adapter_client.cc
bus/fake_nfc_adapter_client.h
bus/fake_nfc_manager_client.cc
bus/fake_nfc_manager_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/nfc_adapter_client.cc
bus/nfc_adapter_client.h
bus/nfc_client_helpers.cc
bus/nfc_client_helpers.h
bus/nfc_client_unittest.cc
bus/nfc_manager_client.cc
bus/nfc_manager_client.h
bus/nfc_property_set.cc
bus/nfc_property_set.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/update_engine_client.cc
me/ibus_bridge.h
me/ime_constants.h
me/mock_ime_engine_handler.cc
me/mock_ime_engine_handler.h
ogin/login_state.cc
ogin/login_state.h
ogin/login_state_unittest.cc
etwork/client_cert_resolver.cc
etwork/managed_network_configuration_handler_impl.cc
etwork/network_configuration_handler.cc
etwork/network_connection_handler.cc
etwork/network_handler_callbacks.cc
etwork/network_handler_callbacks.h
ettings/cros_settings_names.cc
ettings/cros_settings_names.h
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
HROMEOS_LKGM
ttestation/OWNERS
ttestation/attestation_flow.cc
ttestation/attestation_flow.h
ttestation/attestation_flow_unittest.cc
hromeos.gyp
hromeos_paths.cc
hromeos_paths.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/cryptohome_library.cc
ryptohome/cryptohome_library.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
ryptohome/system_salt_getter.cc
ryptohome/system_salt_getter.h
ryptohome/system_salt_getter_unittest.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_dbus_thread_manager.cc
bus/fake_dbus_thread_manager.h
bus/fake_shill_device_client.cc
bus/fake_shill_device_client.h
bus/fake_shill_ipconfig_client.cc
bus/fake_shill_ipconfig_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_shill_profile_client.cc
bus/fake_shill_profile_client.h
bus/fake_shill_service_client.cc
bus/fake_shill_service_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_gsm_sms_client.cc
bus/mock_gsm_sms_client.h
bus/mock_shill_device_client.cc
bus/mock_shill_device_client.h
bus/mock_shill_ipconfig_client.cc
bus/mock_shill_ipconfig_client.h
bus/modem_messaging_client_unittest.cc
bus/power_policy_controller_unittest.cc
bus/shill_device_client.cc
bus/shill_device_client_stub.cc
bus/shill_device_client_stub.h
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client_stub.cc
bus/shill_ipconfig_client_stub.h
bus/shill_manager_client.cc
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_profile_client.cc
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_service_client.cc
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/shill_stub_helper.cc
bus/shill_stub_helper.h
bus/update_engine_client.cc
isks/disk_mount_manager_unittest.cc
isplay/output_configurator.cc
me/xkeyboard.cc
etwork/client_cert_resolver_unittest.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/mock_managed_network_configuration_handler.h
etwork/network_device_handler.cc
etwork/network_sms_handler.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_applicator.h
est/data/network/managed_toplevel_with_global_config.onc
est/data/network/policy/policy_disallow_autoconnect.onc
est/data/network/policy/shill_disallow_autoconnect_on_unmanaged_wifi2.json
est/data/network/policy/shill_managed_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1_wo_uidata.json
est/data/network/policy/shill_policy_on_unmanaged_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_user_wifi1.json
est/data/network/policy/shill_unmanaged_user_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_user_wifi2.json
est/data/network/policy/shill_unmanaged_wifi1.json
est/data/network/policy/shill_unmanaged_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_wifi2.json
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/toplevel_partially_invalid.onc
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
HROMEOS_LKGM
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/cryptohome_library.cc
ryptohome/cryptohome_library.h
ryptohome/cryptohome_util.cc
ryptohome/cryptohome_util.h
ryptohome/mock_cryptohome_library.cc
ryptohome/mock_cryptohome_library.h
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_profile_service_provider.cc
bus/cras_audio_client.cc
bus/cras_audio_client_stub_impl.cc
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/cryptohome_client_stub.cc
bus/cryptohome_client_stub.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_gsm_sms_client.h
bus/fake_image_burner_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_system_clock_client.h
bus/ibus/ibus_client.h
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_input_context_client.h
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_lookup_table.cc
bus/ibus/ibus_lookup_table.h
bus/ibus/ibus_lookup_table_unittest.cc
bus/ibus/ibus_object.cc
bus/ibus/ibus_object.h
bus/ibus/ibus_object_unittest.cc
bus/ibus/ibus_property.cc
bus/ibus/ibus_property.h
bus/ibus/ibus_property_unittest.cc
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/ibus/mock_ibus_input_context_client.cc
bus/ibus/mock_ibus_input_context_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_device_client.cc
bus/shill_device_client_stub.cc
bus/shill_ipconfig_client.cc
bus/shill_manager_client.cc
bus/shill_profile_client.cc
bus/shill_service_client.cc
bus/shill_service_client_stub.cc
bus/shill_stub_helper.cc
bus/shill_stub_helper.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
ocs/OWNERS
ocs/onc_spec.css
ocs/onc_spec.html
ocs/onc_spec.js
me/candidate_window.cc
me/candidate_window.h
me/candidate_window_unittest.cc
me/ibus_bridge.h
me/ibus_daemon_controller.cc
me/input_method_manager.h
me/mock_ime_candidate_window_handler.cc
me/mock_ime_candidate_window_handler.h
me/mock_ime_engine_handler.cc
me/mock_ime_engine_handler.h
me/mock_ime_input_context_handler.cc
me/mock_ime_input_context_handler.h
me/mock_ime_property_handler.h
me/xkeyboard.cc
ogin/login_state.cc
emory/low_memory_listener.cc
etwork/DEPS
etwork/OWNERS
etwork/certificate_pattern.cc
etwork/client_cert_resolver.cc
etwork/device_state.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/mock_managed_network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_unittest.cc
etwork/network_ui_data.cc
etwork/network_ui_data.h
etwork/network_ui_data_unittest.cc
etwork/onc/mock_certificate_importer.h
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_impl.cc
etwork/onc/onc_certificate_importer_impl.h
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_merger.cc
etwork/onc/onc_merger_unittest.cc
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_utils_unittest.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_util.cc
etwork/shill_property_handler.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
ettings/cros_settings_names.cc
ettings/cros_settings_names.h
ettings/cros_settings_provider.cc
ettings/cros_settings_provider.h
ettings/timezone_settings.cc
ettings/timezone_settings.h
ystem/mock_statistics_provider.cc
ystem/mock_statistics_provider.h
ystem/statistics_provider.cc
ystem/statistics_provider.h
est/data/network/policy/policy_ethernet_eap.onc
est/data/network/policy/shill_managed_wifi1.json
est/data/network/policy/shill_policy_on_unconfigured_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_ethernet_eap.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_ethernet_eap.json
est/data/network/policy/shill_unmanaged_user_wifi1.json
est/data/network/policy/shill_unmanaged_user_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_user_wifi2.json
est/data/network/shill_cellular_with_state.json
est/data/network/shill_wifi_clientcert.json
est/data/network/shill_wifi_clientref.json
est/data/network/shill_wifi_psk.json
est/data/network/shill_wifi_with_state.json
est/data/network/shill_wifi_wpa1.json
est/data/network/translation_of_shill_cellular_with_state.onc
ools/onc_validator/onc_validator.cc
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
HROMEOS_LKGM
hromeos.gyp
ryptohome/cryptohome_library.cc
ryptohome/cryptohome_library.h
bus/blocking_method_caller.cc
bus/blocking_method_caller_unittest.cc
bus/dbus_method_call_status.cc
bus/dbus_method_call_status.h
bus/dbus_thread_manager.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_lookup_table.cc
bus/ibus/ibus_lookup_table.h
bus/ibus/ibus_lookup_table_unittest.cc
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_device_client.cc
bus/shill_device_client_stub.cc
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client_stub.cc
bus/shill_manager_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_profile_client_unittest.cc
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/shill_service_client_unittest.cc
bus/shill_stub_helper.cc
bus/shill_stub_helper.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/output_util_unittest.cc
isplay/real_output_configurator_delegate.cc
me/ibus_bridge.h
me/mock_ime_property_handler.cc
me/mock_ime_property_handler.h
etwork/OWNERS
etwork/client_cert_resolver_unittest.cc
etwork/client_cert_util.cc
etwork/device_state.cc
etwork/favorite_state.cc
etwork/geolocation_handler.cc
etwork/geolocation_handler_unittest.cc
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_cert_migrator.cc
etwork/network_cert_migrator_unittest.cc
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler.cc
etwork/network_device_handler_unittest.cc
etwork/network_profile_handler.cc
etwork/network_sms_handler.cc
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/network_state_unittest.cc
etwork/network_util.cc
etwork/network_util_unittest.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/policy_applicator.cc
etwork/policy_util.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
etwork/shill_property_util_unittest.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
HROMEOS_LKGM
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
ert_loader.cc
ert_loader.h
hromeos_switches.cc
hromeos_switches.h
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/cros_disks_client.cc
bus/cryptohome_client_stub.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_device_client.cc
bus/shill_ipconfig_client.cc
bus/shill_manager_client.cc
bus/shill_profile_client.cc
bus/shill_service_client.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
me/xkeyboard.h
ogin/login_state.cc
ogin/login_state.h
ogin/login_state_unittest.cc
etwork/client_cert_resolver.cc
etwork/dhcp_proxy_script_fetcher_chromeos.cc
etwork/dhcp_proxy_script_fetcher_chromeos.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.cc
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/onc/onc_signature.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_validator_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
est/data/network/ethernet.onc
est/data/network/ethernet_with_eap.onc
est/data/network/ethernet_with_eap_and_cert_pems.onc
est/data/network/managed_ethernet.onc
est/data/network/shill_ethernet_with_eap.json
est/data/network/translation_of_shill_ethernet.onc
est/data/network/translation_of_shill_ethernet_with_eap.onc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
HROMEOS_LKGM
udio/audio_devices_pref_handler.h
udio/audio_devices_pref_handler_stub.cc
udio/audio_devices_pref_handler_stub.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/cros_disks_client.h
bus/dbus_thread_manager.cc
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/ibus/ibus_client.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_panel_service.cc
bus/ibus/ibus_panel_service.h
bus/ibus/ibus_panel_service_unittest.cc
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/ibus/mock_ibus_panel_service.cc
bus/ibus/mock_ibus_panel_service.h
bus/mock_session_manager_client.h
bus/mock_shill_device_client.h
bus/mock_shill_ipconfig_client.h
bus/mock_shill_service_client.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_client_unittest_base.h
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
bus/shill_ipconfig_client_stub.cc
bus/shill_ipconfig_client_stub.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/shill_service_client_unittest.cc
isks/disk_mount_manager.cc
isks/disk_mount_manager.h
isplay/output_configurator.cc
isplay/output_util.cc
isplay/real_output_configurator_delegate.cc
me/ibus_bridge.cc
me/mock_ime_candidate_window_handler.cc
me/mock_ime_candidate_window_handler.h
me/mock_ime_engine_handler.cc
me/mock_ime_engine_handler.h
me/mock_ime_input_context_handler.cc
me/mock_ime_input_context_handler.h
me/mock_ime_property_handler.cc
me/mock_ime_property_handler.h
ogin/login_state.cc
ogin/login_state.h
etwork/client_cert_resolver.cc
etwork/client_cert_resolver.h
etwork/client_cert_resolver_unittest.cc
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/cros_network_functions.cc
etwork/cros_network_functions.h
etwork/cros_network_functions_unittest.cc
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_configuration_handler.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/network_ui_data.cc
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_test_utils.cc
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translation_tables.h
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/policy_applicator.cc
etwork/policy_applicator.h
etwork/policy_util.cc
etwork/policy_util.h
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
etwork/shill_property_util.cc
etwork/shill_property_util.h
etwork/shill_property_util_unittest.cc
etwork/sms_watcher.cc
etwork/sms_watcher.h
rocess_proxy/process_proxy.cc
ystem/name_value_pairs_parser.cc
est/data/network/cellular.onc
est/data/network/shill_cellular.json
est/data/network/shill_cellular_with_state.json
est/data/network/translation_of_shill_cellular_with_state.onc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
HROMEOS_LKGM
hromeos.gyp
bus/blocking_method_caller.cc
bus/bluetooth_adapter_client.cc
bus/bluetooth_adapter_client.h
bus/bluetooth_agent_manager_client.cc
bus/bluetooth_agent_manager_client.h
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_input_client.cc
bus/bluetooth_input_client.h
bus/bluetooth_profile_manager_client.cc
bus/bluetooth_profile_manager_client.h
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/cryptohome_client_stub.cc
bus/cryptohome_client_stub.h
bus/dbus_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_adapter_client.h
bus/fake_bluetooth_agent_manager_client.cc
bus/fake_bluetooth_agent_manager_client.h
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_input_client.cc
bus/fake_bluetooth_input_client.h
bus/fake_bluetooth_profile_manager_client.cc
bus/fake_bluetooth_profile_manager_client.h
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_gsm_sms_client.cc
bus/fake_gsm_sms_client.h
bus/fake_image_burner_client.cc
bus/fake_image_burner_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_device_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_system_clock_client.cc
bus/fake_system_clock_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/gsm_sms_client.cc
bus/gsm_sms_client.h
bus/gsm_sms_client_unittest.cc
bus/image_burner_client.cc
bus/image_burner_client.h
bus/introspectable_client.cc
bus/introspectable_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_gsm_sms_client.h
bus/mock_session_manager_client.h
bus/mock_shill_device_client.h
bus/mock_shill_ipconfig_client.h
bus/mock_shill_manager_client.h
bus/mock_shill_profile_client.h
bus/mock_shill_service_client.h
bus/modem_messaging_client.cc
bus/modem_messaging_client.h
bus/modem_messaging_client_unittest.cc
bus/permission_broker_client.cc
bus/permission_broker_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_helper.cc
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_device_client_stub.cc
bus/shill_device_client_stub.h
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
bus/shill_ipconfig_client_stub.cc
bus/shill_ipconfig_client_stub.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_manager_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_profile_client_unittest.cc
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/shill_service_client_unittest.cc
bus/sms_client.cc
bus/sms_client.h
bus/system_clock_client.cc
bus/system_clock_client.h
bus/update_engine_client.cc
bus/update_engine_client.h
me/component_extension_ime_manager.cc
me/gen_input_methods.py
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_methods.txt
etwork/OWNERS
etwork/device_state.cc
etwork/device_state.h
etwork/managed_network_configuration_handler_impl.cc
etwork/network_activation_handler.cc
etwork/network_activation_handler.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/onc/OWNERS
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
HROMEOS_LKGM
ttestation/attestation_constants.cc
ttestation/attestation_constants.h
ttestation/attestation_flow.cc
ttestation/attestation_flow.h
ttestation/attestation_flow_unittest.cc
ttestation/mock_attestation_flow.h
udio/audio_device.cc
udio/audio_device.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
bus/cras_audio_client_stub_impl.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/cryptohome_client_stub.cc
bus/cryptohome_client_stub.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/ibus/ibus_config_client.cc
bus/ibus/ibus_config_client.h
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client.h
bus/ibus/ibus_panel_service.h
bus/ibus/ibus_property.cc
bus/ibus/mock_ibus_config_client.cc
bus/ibus/mock_ibus_config_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/shill_device_client_stub.cc
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
me/ibus_bridge.h
me/ibus_daemon_controller.cc
me/ime_constants.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_methods.txt
etwork/client_cert_resolver.cc
etwork/client_cert_resolver.h
etwork/client_cert_resolver_unittest.cc
etwork/dhcp_proxy_script_fetcher_chromeos.cc
etwork/dhcp_proxy_script_fetcher_chromeos.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_impl.cc
etwork/managed_network_configuration_handler_impl.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/mock_managed_network_configuration_handler.cc
etwork/mock_managed_network_configuration_handler.h
etwork/network_cert_migrator.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_event_log.cc
etwork/network_event_log.h
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_handler_callbacks.cc
etwork/network_handler_callbacks.h
etwork/network_policy_observer.h
etwork/network_profile.cc
etwork/network_profile_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_utils.cc
etwork/shill_property_handler.cc
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/shill_cellular_with_state.json
est/data/network/shill_wifi_wpa1.json
est/data/network/translation_of_shill_cellular_with_state.onc
est/data/network/translation_of_shill_wifi_wpa1.onc
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/cryptohome_client_stub.cc
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
etwork/certificate_pattern_matcher.cc
etwork/certificate_pattern_matcher.h
etwork/client_cert_util.cc
etwork/client_cert_util.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/shill_property_handler.cc
est/data/network/translation_of_shill_openvpn.onc
est/data/network/translation_of_shill_wifi_clientcert.onc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
HROMEOS_LKGM
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/cryptohome_client.cc
bus/cryptohome_client_stub.cc
bus/cryptohome_client_stub.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/shill_service_client_stub.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
me/input_methods.txt
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_handler_callbacks.h
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
HROMEOS_LKGM
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
ert_loader.cc
ert_loader.h
hromeos.gyp
hromeos_constants.cc
hromeos_constants.h
hromeos_switches.cc
hromeos_switches.h
bus/cryptohome_client.cc
bus/dbus_thread_manager.cc
bus/fake_bluetooth_device_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
me/input_methods.txt
etwork/network_cert_migrator.cc
etwork/network_cert_migrator.h
etwork/network_cert_migrator_unittest.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_validator.cc
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
HROMEOS_LKGM
ert_loader.cc
bus/shill_device_client_stub.cc
bus/shill_manager_client_stub.cc
bus/shill_property_changed_observer.h
bus/shill_service_client_stub.cc
ogin/login_state.cc
ogin/login_state.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_configuration_handler_unittest.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_sms_handler.cc
etwork/network_sms_handler.h
etwork/network_sms_handler_unittest.cc
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
HROMEOS_LKGM
udio/audio_device.cc
udio/audio_pref_handler.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/mock_async_method_caller.h
bus/audio_node.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/ibus/ibus_panel_service.cc
bus/mock_cryptohome_client.h
bus/shill_service_client_stub.cc
bus/update_engine_client.cc
bus/update_engine_client.h
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/output_util_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
me/input_methods.txt
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_event_log_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_unittest.cc
etwork/shill_property_handler.cc
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
HROMEOS_LKGM
udio/audio_devices_pref_handler.h
udio/audio_devices_pref_handler_stub.cc
udio/audio_devices_pref_handler_stub.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_handler_unittest.cc
udio/mock_cras_audio_handler.cc
udio/mock_cras_audio_handler.h
ert_loader.cc
ert_loader.h
hromeos.gyp
bus/audio_node.cc
bus/audio_node.h
bus/cras_audio_client.cc
bus/cras_audio_client_stub_impl.cc
bus/cras_audio_client_stub_impl.h
bus/shill_service_client_stub.cc
isplay/output_configurator.cc
isplay/output_configurator.h
me/input_methods.txt
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/certificate_handler.cc
etwork/certificate_handler.h
etwork/device_state.cc
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/mock_certificate_handler.cc
etwork/mock_certificate_handler.h
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/onc/mock_certificate_importer.cc
etwork/onc/mock_certificate_importer.h
etwork/onc/onc_certificate_importer.cc
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_impl.cc
etwork/onc/onc_certificate_importer_impl.h
etwork/onc/onc_certificate_importer_impl_unittest.cc
etwork/onc/onc_certificate_importer_unittest.cc
est/data/network/policy/shill_unmanaged_user_wifi2.json
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
etwork/network_state_handler.cc
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
HROMEOS_LKGM
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/mock_cryptohome_client.h
bus/mock_session_manager_client.h
bus/session_manager_client.cc
bus/session_manager_client.h
me/input_methods.txt
etwork/network_device_handler.cc
etwork/network_device_handler.h
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
HROMEOS_LKGM
hromeos_switches.cc
hromeos_switches.h
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/ibus_daemon_controller.cc
me/input_method_manager.h
me/input_methods.txt
me/xkeyboard.cc
etwork/device_state.cc
etwork/device_state.h
etwork/network_device_handler.cc
etwork/network_device_handler.h
etwork/network_util.cc
etwork/network_util.h
etwork/network_util_unittest.cc
rocess_proxy/process_proxy.cc
rocess_proxy/process_proxy_unittest.cc
ystem/name_value_pairs_parser.cc
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
HROMEOS_LKGM
udio/audio_device.cc
hromeos_switches.cc
hromeos_switches.h
isplay/output_util.cc
isplay/output_util_unittest.cc
etwork/certificate_handler.cc
etwork/certificate_handler.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/mock_certificate_handler.h
etwork/network_device_handler.cc
etwork/network_device_handler.h
etwork/network_device_handler_unittest.cc
etwork/onc/onc_certificate_importer_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_utils_unittest.cc
rocess_proxy/process_output_watcher_unittest.cc
est/data/network/network_configs_with_resolved_certs.json
est/data/network/policy/policy_wifi1_with_redundant_fields.onc
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1_wo_uidata.json
est/data/network/policy/shill_unmanaged_user_wifi1_wo_uidata.json
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/toplevel_partially_invalid.onc
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
bus/cryptohome_client.cc
bus/debug_daemon_client.cc
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_device_client.cc
bus/fake_cros_disks_client.cc
bus/fake_cryptohome_client.cc
bus/fake_gsm_sms_client.cc
bus/fake_session_manager_client.cc
bus/gsm_sms_client.cc
bus/gsm_sms_client_unittest.cc
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_panel_service_unittest.cc
bus/mock_cryptohome_client.cc
bus/modem_messaging_client.cc
bus/modem_messaging_client_unittest.cc
bus/power_manager_client.cc
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/shill_client_unittest_base.h
bus/shill_device_client.cc
bus/shill_device_client_stub.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client_stub.cc
bus/shill_manager_client.cc
bus/shill_manager_client_stub.cc
bus/shill_profile_client.cc
bus/shill_profile_client_stub.cc
bus/shill_service_client.cc
bus/shill_service_client_stub.cc
bus/sms_client.cc
isks/disk_mount_manager_unittest.cc
isks/mock_disk_mount_manager.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
me/xkeyboard.cc
me/xkeyboard_unittest.cc
ogin/login_state_unittest.cc
emory/low_memory_listener.cc
etwork/geolocation_handler_unittest.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler_unittest.cc
etwork/network_sms_handler_unittest.cc
etwork/network_state_handler_unittest.cc
etwork/shill_property_handler_unittest.cc
rocess_proxy/process_proxy_unittest.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
HROMEOS_LKGM
udio/audio_device.cc
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/mock_cras_audio_handler.cc
udio/mock_cras_audio_handler.h
hromeos.gyp
hromeos_constants.cc
hromeos_constants.h
hromeos_switches.cc
hromeos_switches.h
hromeos_test_utils.cc
bus/audio_node.cc
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cros_disks_client_unittest.cc
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_shill_device_client.cc
bus/fake_shill_device_client.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_shill_service_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/session_manager_client.cc
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_client_unittest_base.h
bus/shill_device_client_stub.cc
bus/shill_ipconfig_client_stub.cc
bus/shill_manager_client.cc
bus/shill_manager_client_stub.cc
bus/shill_manager_client_unittest.cc
bus/shill_profile_client_stub.cc
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/shill_service_client_unittest.cc
isks/disk_mount_manager.cc
me/input_method_descriptor.cc
me/input_method_descriptor.h
etwork/cros_network_functions.cc
etwork/cros_network_functions.h
etwork/cros_network_functions_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_device_handler.cc
etwork/network_device_handler.h
etwork/network_device_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_handler_callbacks.cc
etwork/network_handler_callbacks.h
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/onc/onc_utils.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
ystem/name_value_pairs_parser.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
HROMEOS_LKGM
udio/audio_device.cc
udio/audio_device.h
udio/audio_devices_pref_handler.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
hromeos.gyp
hromeos_constants.cc
hromeos_constants.h
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_device_client.cc
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/ibus/ibus_property.cc
bus/ibus/ibus_property.h
bus/ibus/ibus_text.cc
bus/ibus/ibus_text.h
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/mock_cryptohome_client.h
bus/mock_shill_device_client.h
bus/mock_shill_manager_client.h
bus/mock_shill_service_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/power_supply_status.cc
bus/power_supply_status.h
bus/session_manager_client.cc
bus/shill_client_helper.cc
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_device_client_stub.cc
bus/shill_device_client_stub.h
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client_stub.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_manager_client_unittest.cc
bus/shill_profile_client.h
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/update_engine_client.cc
bus/update_engine_client.h
bus/volume_state.cc
bus/volume_state.h
isks/disk_mount_manager.cc
isplay/output_configurator.cc
isplay/output_configurator.h
me/input_method_manager.h
me/input_method_whitelist_unittest.cc
me/input_methods.txt
emory/low_memory_listener.cc
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/certificate_handler.cc
etwork/certificate_handler.h
etwork/certificate_pattern.cc
etwork/certificate_pattern.h
etwork/certificate_pattern_matcher.cc
etwork/cros_network_functions.cc
etwork/cros_network_functions.h
etwork/cros_network_functions_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/favorite_state.cc
etwork/favorite_state.h
etwork/geolocation_handler.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/mock_certificate_handler.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_event_log.h
etwork/network_handler.cc
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/network_ui_data.cc
etwork/network_ui_data_unittest.cc
etwork/network_util.h
etwork/onc/onc_certificate_importer.cc
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_merger.cc
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_test_utils.cc
etwork/onc/onc_test_utils.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_utils_unittest.cc
etwork/onc/onc_validator.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
ower/power_manager_handler.cc
ower/power_manager_handler.h
ower/power_manager_handler_unittest.cc
est/data/network/l2tpipsec_clientcert_with_cert_pems.onc
est/data/network/managed_toplevel1_with_cert_pems.onc
est/data/network/managed_toplevel2_with_cert_pems.onc
est/data/network/network_configs_with_resolved_certs.json
est/data/network/openvpn_clientcert_with_cert_pems.onc
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/shill_openvpn.json
est/data/network/shill_openvpn_clientcert.json
est/data/network/shill_openvpn_with_errors.json
est/data/network/shill_wifi_psk.json
est/data/network/toplevel_openvpn_clientcert.onc
est/data/network/toplevel_openvpn_clientcert_with_cert_pems.onc
est/data/network/toplevel_partially_invalid.onc
est/data/network/toplevel_wifi_eap_clientcert.onc
est/data/network/toplevel_wifi_eap_clientcert_with_cert_pems.onc
est/data/network/translation_of_shill_openvpn.onc
est/data/network/translation_of_shill_openvpn_with_errors.onc
est/data/network/uidata_for_l2tpipsec_clientcert.json
est/data/network/uidata_for_openvpn_clientcert.json
est/data/network/uidata_for_wifi_clientcert.json
est/data/network/valid_l2tpipsec_clientcert.onc
est/data/network/valid_openvpn_clientcert.onc
est/data/network/valid_openvpn_with_cert_pems.onc
est/data/network/valid_wifi_clientcert.onc
est/data/network/valid_wifi_psk.onc
est/data/network/wifi_clientcert_with_cert_pems.onc
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
HROMEOS_LKGM
udio/cras_audio_handler.cc
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
bus/blocking_method_caller_unittest.cc
bus/bluetooth_adapter_client.cc
bus/bluetooth_adapter_client.h
bus/bluetooth_agent_manager_client.cc
bus/bluetooth_agent_manager_client.h
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_agent_service_provider.h
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_input_client.cc
bus/bluetooth_input_client.h
bus/bluetooth_profile_manager_client.cc
bus/bluetooth_profile_manager_client.h
bus/bluetooth_profile_service_provider.cc
bus/bluetooth_profile_service_provider.h
bus/cros_disks_client.cc
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/experimental_bluetooth_adapter_client.cc
bus/experimental_bluetooth_adapter_client.h
bus/experimental_bluetooth_agent_manager_client.cc
bus/experimental_bluetooth_agent_manager_client.h
bus/experimental_bluetooth_agent_service_provider.cc
bus/experimental_bluetooth_agent_service_provider.h
bus/experimental_bluetooth_device_client.cc
bus/experimental_bluetooth_device_client.h
bus/experimental_bluetooth_input_client.cc
bus/experimental_bluetooth_input_client.h
bus/experimental_bluetooth_profile_manager_client.cc
bus/experimental_bluetooth_profile_manager_client.h
bus/experimental_bluetooth_profile_service_provider.cc
bus/experimental_bluetooth_profile_service_provider.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_adapter_client.h
bus/fake_bluetooth_agent_manager_client.h
bus/fake_bluetooth_agent_service_provider.cc
bus/fake_bluetooth_agent_service_provider.h
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_input_client.cc
bus/fake_bluetooth_input_client.h
bus/fake_bluetooth_profile_manager_client.h
bus/fake_bluetooth_profile_service_provider.cc
bus/fake_bluetooth_profile_service_provider.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/gsm_sms_client_unittest.cc
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_object.cc
bus/ibus/ibus_panel_service_unittest.cc
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_session_manager_client.h
bus/modem_messaging_client_unittest.cc
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_unittest_base.cc
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client_stub.cc
bus/shill_manager_client_unittest.cc
bus/shill_profile_client_unittest.cc
bus/shill_service_client.cc
bus/shill_service_client_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/output_util_unittest.cc
isplay/real_output_configurator_delegate.cc
me/component_extension_ime_manager.cc
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_methods.txt
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/network_change_notifier_chromeos.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_handler.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_certificate_importer_unittest.cc
rocess_proxy/process_proxy.cc
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
HROMEOS_LKGM
pp_mode/kiosk_oem_manifest_parser.cc
ttestation/attestation_flow_unittest.cc
udio/audio_device.cc
udio/audio_device.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/cryptohome_library.cc
bus/audio_node.cc
bus/cros_disks_client.cc
bus/cryptohome_client.cc
bus/dbus_thread_manager.cc
bus/debug_daemon_client.cc
bus/experimental_bluetooth_adapter_client.cc
bus/experimental_bluetooth_agent_manager_client.cc
bus/experimental_bluetooth_agent_service_provider.cc
bus/experimental_bluetooth_device_client.cc
bus/experimental_bluetooth_input_client.cc
bus/experimental_bluetooth_profile_manager_client.cc
bus/experimental_bluetooth_profile_service_provider.cc
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_agent_manager_client.cc
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_input_client.cc
bus/fake_bluetooth_profile_manager_client.cc
bus/fake_cryptohome_client.cc
bus/fake_gsm_sms_client.cc
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/gsm_sms_client.cc
bus/gsm_sms_client_unittest.cc
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_engine_factory_service.cc
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_panel_service_unittest.cc
bus/ibus/ibus_property_unittest.cc
bus/mock_cryptohome_client.cc
bus/modem_messaging_client_unittest.cc
bus/permission_broker_client.cc
bus/permission_broker_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/power_supply_status.cc
bus/session_manager_client.cc
bus/shill_client_unittest_base.h
bus/shill_device_client_stub.cc
bus/shill_ipconfig_client_stub.cc
bus/shill_manager_client_stub.cc
bus/shill_profile_client_stub.cc
bus/shill_service_client_stub.cc
bus/sms_client.cc
bus/update_engine_client.cc
bus/volume_state.cc
isks/disk_mount_manager.cc
isks/disk_mount_manager_unittest.cc
isks/mock_disk_mount_manager.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/real_output_configurator_delegate.cc
me/component_extension_ime_manager.cc
me/extension_ime_util.cc
me/ibus_daemon_controller.cc
me/input_method_delegate.h
me/xkeyboard.cc
me/xkeyboard_unittest.cc
ogin/login_state.cc
ogin/login_state.h
ogin/login_state_unittest.cc
emory/low_memory_listener.cc
etwork/cert_loader.cc
etwork/device_state.cc
etwork/geolocation_handler.cc
etwork/geolocation_handler_unittest.cc
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_event_log.h
etwork/network_event_log_unittest.cc
etwork/network_handler_callbacks.h
etwork/network_profile.cc
etwork/network_profile_handler.cc
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/network_util.cc
etwork/onc/onc_certificate_importer_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_validator.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
ower/power_manager_handler.cc
ower/power_manager_handler_unittest.cc
rocess_proxy/process_proxy_unittest.cc
ystem/name_value_pairs_parser.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
HROMEOS_LKGM
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
bus/DEPS
bus/bluetooth_adapter_client.cc
bus/bluetooth_adapter_client.h
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_agent_service_provider.h
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_input_client.cc
bus/bluetooth_input_client.h
bus/bluetooth_manager_client.cc
bus/bluetooth_manager_client.h
bus/bluetooth_node_client.cc
bus/bluetooth_node_client.h
bus/bluetooth_out_of_band_client.cc
bus/bluetooth_out_of_band_client.h
bus/bluetooth_property.cc
bus/bluetooth_property.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/experimental_bluetooth_input_client.cc
bus/fake_bluetooth_input_client.cc
bus/fake_old_bluetooth_adapter_client.cc
bus/fake_old_bluetooth_adapter_client.h
bus/fake_old_bluetooth_device_client.cc
bus/fake_old_bluetooth_device_client.h
bus/fake_old_bluetooth_manager_client.cc
bus/fake_old_bluetooth_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_factory_service.cc
bus/ibus/ibus_engine_factory_service.h
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/mock_ibus_engine_factory_service.cc
bus/ibus/mock_ibus_engine_factory_service.h
bus/mock_bluetooth_adapter_client.cc
bus/mock_bluetooth_adapter_client.h
bus/mock_bluetooth_device_client.cc
bus/mock_bluetooth_device_client.h
bus/mock_bluetooth_input_client.cc
bus/mock_bluetooth_input_client.h
bus/mock_bluetooth_manager_client.cc
bus/mock_bluetooth_manager_client.h
bus/mock_bluetooth_node_client.cc
bus/mock_bluetooth_node_client.h
bus/mock_bluetooth_out_of_band_client.cc
bus/mock_bluetooth_out_of_band_client.h
bus/mock_cros_disks_client.cc
bus/mock_cros_disks_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_image_burner_client.cc
bus/mock_image_burner_client.h
bus/mock_power_manager_client.cc
bus/mock_power_manager_client.h
bus/mock_session_manager_client.h
bus/mock_system_clock_client.cc
bus/mock_system_clock_client.h
bus/mock_update_engine_client.cc
bus/mock_update_engine_client.h
bus/power_manager_client.cc
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_service_client.cc
bus/shill_service_client_stub.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/output_util.cc
isplay/output_util.h
isplay/output_util_unittest.cc
isplay/real_output_configurator_delegate.cc
me/ibus_keymap.cc
me/input_method_manager.h
me/input_methods.txt
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/geolocation_handler.cc
etwork/geolocation_handler.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_event_log.h
etwork/network_event_log_unittest.cc
etwork/network_handler.cc
etwork/network_handler.h
etwork/network_handler_callbacks.cc
etwork/network_handler_callbacks.h
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_profile_handler_stub.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_unittest.cc
etwork/onc/onc_certificate_importer.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
ower/power_manager_handler.cc
ower/power_manager_handler.h
ower/power_manager_handler_unittest.cc
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
HROMEOS_LKGM
pp_mode/kiosk_oem_manifest_parser.cc
pp_mode/kiosk_oem_manifest_parser.h
pp_mode/kiosk_oem_manifest_parser_unittest.cc
hromeos.gyp
hromeos_constants.cc
hromeos_constants.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_cryptohome_client.cc
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/ibus/mock_ibus_client.cc
bus/ibus/mock_ibus_client.h
bus/mock_session_manager_client.h
bus/power_manager_client.cc
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
isks/disk_mount_manager_unittest.cc
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/real_output_configurator_delegate.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_whitelist.cc
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/certificate_pattern_matcher.cc
etwork/certificate_pattern_matcher.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_connection_handler.cc
etwork/network_connection_handler.h
etwork/network_connection_handler_unittest.cc
etwork/network_handler_callbacks.h
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler_unittest.cc
etwork/network_ui_data.cc
etwork/network_ui_data.h
etwork/network_ui_data_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler_unittest.cc
ystem/name_value_pairs_parser.cc
ystem/name_value_pairs_parser.h
ystem/name_value_pairs_parser_unittest.cc
est/data/app_mode/kiosk_manifest/kiosk_manifest.json
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
HROMEOS_LKGM
udio/audio_devices_pref_handler.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_switch_handler.cc
udio/cras_audio_switch_handler.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
ryptohome/cryptohome_library.cc
bus/cryptohome_client.cc
bus/debug_daemon_client.cc
bus/experimental_bluetooth_input_client.cc
bus/experimental_bluetooth_profile_service_provider.cc
bus/experimental_bluetooth_profile_service_provider.h
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_profile_manager_client.cc
bus/fake_bluetooth_profile_manager_client.h
bus/fake_bluetooth_profile_service_provider.cc
bus/fake_bluetooth_profile_service_provider.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_gsm_sms_client.cc
bus/fake_gsm_sms_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/gsm_sms_client.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_input_context_client.h
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_shill_manager_client.h
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_manager_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
me/ibus_keymap.cc
me/input_method_manager.cc
me/input_method_manager.h
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/network_profile.cc
etwork/network_profile.h
etwork/network_profile_handler.cc
etwork/network_profile_handler.h
etwork/network_profile_handler_stub.h
etwork/network_profile_observer.h
etwork/network_state_unittest.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
est/data/network/policy/shill_policy_on_unconfigured_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1.json
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
HROMEOS_LKGM
WNERS
ttestation/OWNERS
ttestation/attestation_constants.cc
ttestation/attestation_constants.h
ttestation/attestation_flow.cc
ttestation/attestation_flow.h
ttestation/attestation_flow_unittest.cc
ttestation/mock_attestation_flow.cc
ttestation/mock_attestation_flow.h
udio/OWNERS
udio/audio_device.cc
udio/audio_device.h
udio/audio_devices_pref_handler.h
udio/audio_pref_handler.h
udio/audio_pref_observer.h
udio/cras_audio_handler.cc
udio/cras_audio_handler.h
udio/cras_audio_switch_handler.cc
udio/cras_audio_switch_handler.h
udio/mock_cras_audio_handler.cc
udio/mock_cras_audio_handler.h
hromeos.gyp
hromeos_memory.gypi
hromeos_paths.cc
hromeos_paths.h
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/cryptohome_library.cc
ryptohome/cryptohome_library.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
ryptohome/mock_cryptohome_library.cc
ryptohome/mock_cryptohome_library.h
bus/audio_node.cc
bus/audio_node.h
bus/bluetooth_adapter_client.cc
bus/bluetooth_device_client.cc
bus/bluetooth_manager_client.cc
bus/cras_audio_client.cc
bus/cras_audio_client.h
bus/cros_disks_client.cc
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/experimental_bluetooth_adapter_client.cc
bus/experimental_bluetooth_adapter_client.h
bus/experimental_bluetooth_agent_manager_client.cc
bus/experimental_bluetooth_agent_manager_client.h
bus/experimental_bluetooth_agent_service_provider.cc
bus/experimental_bluetooth_agent_service_provider.h
bus/experimental_bluetooth_device_client.cc
bus/experimental_bluetooth_device_client.h
bus/experimental_bluetooth_input_client.cc
bus/experimental_bluetooth_input_client.h
bus/experimental_bluetooth_profile_manager_client.cc
bus/experimental_bluetooth_profile_manager_client.h
bus/experimental_bluetooth_profile_service_provider.cc
bus/experimental_bluetooth_profile_service_provider.h
bus/fake_bluetooth_adapter_client.cc
bus/fake_bluetooth_adapter_client.h
bus/fake_bluetooth_agent_manager_client.cc
bus/fake_bluetooth_agent_manager_client.h
bus/fake_bluetooth_agent_service_provider.cc
bus/fake_bluetooth_agent_service_provider.h
bus/fake_bluetooth_device_client.cc
bus/fake_bluetooth_device_client.h
bus/fake_bluetooth_input_client.cc
bus/fake_bluetooth_input_client.h
bus/fake_bluetooth_profile_manager_client.cc
bus/fake_bluetooth_profile_manager_client.h
bus/fake_bluetooth_profile_service_provider.cc
bus/fake_bluetooth_profile_service_provider.h
bus/fake_cros_disks_client.cc
bus/fake_cros_disks_client.h
bus/fake_cryptohome_client.cc
bus/fake_cryptohome_client.h
bus/fake_image_burner_client.cc
bus/fake_image_burner_client.h
bus/fake_old_bluetooth_adapter_client.cc
bus/fake_old_bluetooth_adapter_client.h
bus/fake_old_bluetooth_device_client.cc
bus/fake_old_bluetooth_device_client.h
bus/fake_old_bluetooth_manager_client.cc
bus/fake_old_bluetooth_manager_client.h
bus/fake_power_manager_client.cc
bus/fake_power_manager_client.h
bus/fake_shill_manager_client.cc
bus/fake_shill_manager_client.h
bus/fake_system_clock_client.cc
bus/fake_system_clock_client.h
bus/fake_update_engine_client.cc
bus/fake_update_engine_client.h
bus/ibus/ibus_component.cc
bus/ibus/ibus_component.h
bus/ibus/ibus_component_unittest.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_lookup_table_unittest.cc
bus/ibus/ibus_object_unittest.cc
bus/ibus/mock_ibus_client.cc
bus/ibus/mock_ibus_engine_factory_service.cc
bus/ibus/mock_ibus_engine_factory_service.h
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/image_burner_client.cc
bus/mock_cryptohome_client.cc
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_debug_daemon_client.cc
bus/mock_debug_daemon_client.h
bus/mock_introspectable_client.cc
bus/mock_introspectable_client.h
bus/mock_modem_messaging_client.cc
bus/mock_modem_messaging_client.h
bus/mock_permission_broker_client.cc
bus/mock_permission_broker_client.h
bus/mock_shill_manager_client.cc
bus/mock_shill_manager_client.h
bus/mock_shill_profile_client.h
bus/mock_sms_client.cc
bus/mock_sms_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/power_supply_status.cc
bus/power_supply_status.h
bus/shill_client_helper.cc
bus/shill_device_client.h
bus/shill_device_client_stub.cc
bus/shill_device_client_stub.h
bus/shill_ipconfig_client_stub.cc
bus/shill_ipconfig_client_stub.h
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/system_clock_client.cc
bus/volume_state.cc
bus/volume_state.h
isplay/OWNERS
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
isplay/real_output_configurator_delegate.cc
isplay/real_output_configurator_delegate.h
ocs/onc_spec.html
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/component_extension_ime_manager_unittest.cc
me/extension_ime_util.cc
me/extension_ime_util.h
me/extension_ime_util_unittest.cc
me/fake_input_method_delegate.cc
me/fake_input_method_delegate.h
me/gen_input_methods.py
me/ibus_daemon_controller.cc
me/ibus_keymap.cc
me/input_method.gyp
me/input_method_delegate.h
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_descriptor_unittest.cc
me/input_method_manager.h
me/input_method_whitelist.cc
me/input_method_whitelist.h
me/input_method_whitelist_unittest.cc
me/input_methods.txt
me/mock_component_extension_ime_manager_delegate.cc
me/mock_component_extension_ime_manager_delegate.h
me/mock_input_method_delegate.cc
me/mock_input_method_delegate.h
me/mock_xkeyboard.cc
me/mock_xkeyboard.h
me/xkeyboard.cc
me/xkeyboard.h
me/xkeyboard_unittest.cc
ogin/login_state.cc
ogin/login_state.h
ogin/login_state_unittest.cc
emory/DEPS
emory/chromeos_memory_export.h
emory/low_memory_listener.cc
emory/low_memory_listener.h
emory/low_memory_listener_delegate.h
etwork/cert_loader.cc
etwork/cert_loader.h
etwork/certificate_handler.cc
etwork/certificate_handler.h
etwork/certificate_pattern.cc
etwork/certificate_pattern.h
etwork/cros_network_functions.cc
etwork/cros_network_functions_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/geolocation_handler.cc
etwork/managed_network_configuration_handler.cc
etwork/managed_network_configuration_handler.h
etwork/managed_network_configuration_handler_unittest.cc
etwork/managed_state.cc
etwork/managed_state.h
etwork/mock_certificate_handler.cc
etwork/mock_certificate_handler.h
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos.h
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_configuration_handler.cc
etwork/network_configuration_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/network_state_unittest.cc
etwork/network_ui_data.cc
etwork/network_ui_data.h
etwork/network_ui_data_unittest.cc
etwork/onc/onc_certificate_importer.cc
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_mapper.cc
etwork/onc/onc_mapper.h
etwork/onc/onc_merger.cc
etwork/onc/onc_merger.h
etwork/onc/onc_merger_unittest.cc
etwork/onc/onc_normalizer.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_utils_unittest.cc
etwork/onc/onc_validator_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
est/data/network/augmented_merge.json
est/data/network/certificate-authority.onc
est/data/network/certificate-server-update.onc
est/data/network/certificate-server.onc
est/data/network/certificate-web-authority-update.onc
est/data/network/certificate-web-authority.onc
est/data/network/invalid_settings_with_repairs.json
est/data/network/managed_toplevel2.onc
est/data/network/policy/policy_wifi1.onc
est/data/network/policy/shill_managed_wifi1.json
est/data/network/policy/shill_policy_on_unconfigured_wifi1.json
est/data/network/policy/shill_policy_on_unmanaged_user_wifi1.json
est/data/network/policy/shill_unmanaged_user_wifi1.json
est/data/network/repaired_toplevel_partially_invalid.onc
est/data/network/toplevel_openvpn_clientcert.onc
est/data/network/toplevel_wifi_eap_clientcert.onc
est/data/network/uidata_for_l2tpipsec_clientcert.json
est/data/network/uidata_for_openvpn_clientcert.json
est/data/network/uidata_for_wifi_clientcert.json
est/data/network/uidata_for_wifi_clientref.json
est/data/network/uidata_for_wifi_psk.json
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
HROMEOS_LKGM
EPS
ttestation/attestation_flow.cc
ttestation/attestation_flow.h
ttestation/attestation_flow_unittest.cc
ttestation/mock_attestation_flow.cc
ttestation/mock_attestation_flow.h
hromeos.gyp
hromeos_switches.cc
hromeos_switches.h
hromeos_test_utils.cc
hromeos_test_utils.h
hromeos_tools.gypi
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
bus/blocking_method_caller.cc
bus/blocking_method_caller.h
bus/blocking_method_caller_unittest.cc
bus/bluetooth_adapter_client.cc
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_device_client.cc
bus/bluetooth_input_client.cc
bus/bluetooth_manager_client.cc
bus/bluetooth_node_client.cc
bus/cashew_client.cc
bus/cashew_client.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_method_call_status.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/fake_session_manager_client.cc
bus/fake_session_manager_client.h
bus/ibus/ibus_client.cc
bus/ibus/ibus_client.h
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_component.cc
bus/ibus/ibus_component.h
bus/ibus/ibus_component_unittest.cc
bus/ibus/ibus_config_client.cc
bus/ibus/ibus_config_client.h
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_factory_service.cc
bus/ibus/ibus_engine_factory_service.h
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_input_context_client.h
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_lookup_table.cc
bus/ibus/ibus_lookup_table.h
bus/ibus/ibus_lookup_table_unittest.cc
bus/ibus/ibus_object.cc
bus/ibus/ibus_object.h
bus/ibus/ibus_object_unittest.cc
bus/ibus/ibus_panel_service.cc
bus/ibus/ibus_panel_service.h
bus/ibus/ibus_panel_service_unittest.cc
bus/ibus/ibus_property.cc
bus/ibus/ibus_property.h
bus/ibus/ibus_property_unittest.cc
bus/ibus/ibus_text.cc
bus/ibus/ibus_text.h
bus/ibus/ibus_text_unittest.cc
bus/ibus/mock_ibus_client.cc
bus/ibus/mock_ibus_client.h
bus/ibus/mock_ibus_config_client.cc
bus/ibus/mock_ibus_config_client.h
bus/ibus/mock_ibus_engine_factory_service.cc
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/ibus/mock_ibus_input_context_client.cc
bus/ibus/mock_ibus_input_context_client.h
bus/ibus/mock_ibus_panel_service.cc
bus/ibus/mock_ibus_panel_service.h
bus/introspectable_client.cc
bus/mock_cashew_client.cc
bus/mock_cashew_client.h
bus/mock_cros_disks_client.cc
bus/mock_cros_disks_client.h
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_debug_daemon_client.h
bus/mock_power_manager_client.cc
bus/mock_power_manager_client.h
bus/mock_session_manager_client.h
bus/mock_shill_device_client.h
bus/mock_shill_manager_client.h
bus/mock_shill_network_client.cc
bus/mock_shill_network_client.h
bus/mock_shill_service_client.h
bus/mock_speech_synthesizer_client.cc
bus/mock_speech_synthesizer_client.h
bus/mock_system_clock_client.cc
bus/mock_system_clock_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_policy_controller.cc
bus/power_policy_controller.h
bus/power_policy_controller_unittest.cc
bus/power_supply_status.cc
bus/power_supply_status.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_client_unittest_base.h
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_device_client_stub.cc
bus/shill_device_client_stub.h
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
bus/shill_ipconfig_client_stub.cc
bus/shill_ipconfig_client_stub.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_stub.cc
bus/shill_manager_client_stub.h
bus/shill_manager_client_unittest.cc
bus/shill_network_client.cc
bus/shill_network_client.h
bus/shill_network_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client_stub.cc
bus/shill_profile_client_stub.h
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_stub.cc
bus/shill_service_client_stub.h
bus/sms_client.cc
bus/speech_synthesizer_client.cc
bus/speech_synthesizer_client.h
bus/system_clock_client.cc
bus/system_clock_client.h
bus/update_engine_client.cc
isks/disk_mount_manager.cc
isks/disk_mount_manager.h
isks/disk_mount_manager_unittest.cc
isks/mock_disk_mount_manager.cc
isks/mock_disk_mount_manager.h
isplay/output_configurator.cc
isplay/output_configurator.h
ocs/OWNERS
ocs/onc_spec.css
ocs/onc_spec.html
ocs/onc_spec.js
me/OWNERS
me/component_extension_ime_manager.cc
me/component_extension_ime_manager.h
me/ibus_bridge.cc
me/ibus_bridge.h
me/ibus_daemon_controller.cc
me/ibus_daemon_controller.h
me/ibus_keymap.cc
me/ibus_keymap.h
me/input_method_config.cc
me/input_method_config.h
me/input_method_delegate.h
me/input_method_descriptor.cc
me/input_method_descriptor.h
me/input_method_descriptor_unittest.cc
me/input_method_property.cc
me/input_method_property.h
me/input_method_property_unittest.cc
me/mock_ibus_daemon_controller.cc
me/mock_ibus_daemon_controller.h
me/mock_input_method_delegate.cc
me/mock_input_method_delegate.h
etwork/OWNERS
etwork/cros_network_functions.cc
etwork/cros_network_functions.h
etwork/cros_network_functions_unittest.cc
etwork/device_state.cc
etwork/device_state.h
etwork/geolocation_handler.cc
etwork/geolocation_handler.h
etwork/geolocation_handler_unittest.cc
etwork/managed_state.h
etwork/network_change_notifier_chromeos.cc
etwork/network_change_notifier_chromeos.h
etwork/network_change_notifier_chromeos_unittest.cc
etwork/network_change_notifier_factory_chromeos.cc
etwork/network_change_notifier_factory_chromeos.h
etwork/network_configuration_handler.cc
etwork/network_configuration_handler.h
etwork/network_configuration_handler_unittest.cc
etwork/network_event_log.cc
etwork/network_event_log.h
etwork/network_event_log_unittest.cc
etwork/network_handler_callbacks.cc
etwork/network_handler_callbacks.h
etwork/network_ip_config.cc
etwork/network_ip_config.h
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.cc
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/network_util.cc
etwork/network_util.h
etwork/network_util_unittest.cc
etwork/onc/OWNERS
etwork/onc/onc_certificate_importer.cc
etwork/onc/onc_certificate_importer.h
etwork/onc/onc_certificate_importer_unittest.cc
etwork/onc/onc_constants.cc
etwork/onc/onc_constants.h
etwork/onc/onc_mapper.cc
etwork/onc/onc_mapper.h
etwork/onc/onc_merger.cc
etwork/onc/onc_merger.h
etwork/onc/onc_merger_unittest.cc
etwork/onc/onc_normalizer.cc
etwork/onc/onc_normalizer.h
etwork/onc/onc_normalizer_unittest.cc
etwork/onc/onc_signature.cc
etwork/onc/onc_signature.h
etwork/onc/onc_test_utils.cc
etwork/onc/onc_test_utils.h
etwork/onc/onc_translation_tables.cc
etwork/onc/onc_translation_tables.h
etwork/onc/onc_translator.h
etwork/onc/onc_translator_onc_to_shill.cc
etwork/onc/onc_translator_shill_to_onc.cc
etwork/onc/onc_translator_unittest.cc
etwork/onc/onc_utils.cc
etwork/onc/onc_utils.h
etwork/onc/onc_utils_unittest.cc
etwork/onc/onc_validator.cc
etwork/onc/onc_validator.h
etwork/onc/onc_validator_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
etwork/shill_service_observer.cc
etwork/shill_service_observer.h
etwork/sms_watcher.cc
etwork/sms_watcher.h
ower/power_state_override.cc
ower/power_state_override.h
ower/power_state_override_unittest.cc
rocess_proxy/OWNERS
rocess_proxy/process_output_watcher.cc
rocess_proxy/process_output_watcher.h
rocess_proxy/process_output_watcher_unittest.cc
rocess_proxy/process_proxy.cc
rocess_proxy/process_proxy.h
rocess_proxy/process_proxy_registry.cc
rocess_proxy/process_proxy_registry.h
rocess_proxy/process_proxy_unittest.cc
est/data/OWNERS
est/data/network/augmented_merge.json
est/data/network/broken-encrypted-iterations.onc
est/data/network/broken-encrypted-zero-iterations.onc
est/data/network/certificate-client-update.onc
est/data/network/certificate-client.onc
est/data/network/certificate-server-update.onc
est/data/network/certificate-server.onc
est/data/network/certificate-web-authority-update.onc
est/data/network/certificate-web-authority.onc
est/data/network/decrypted.onc
est/data/network/device_policy.onc
est/data/network/encrypted.onc
est/data/network/invalid_settings_with_repairs.json
est/data/network/managed_ethernet.onc
est/data/network/managed_toplevel1.onc
est/data/network/managed_toplevel2.onc
est/data/network/managed_toplevel_l2tpipsec.onc
est/data/network/managed_toplevel_wifi_peap.onc
est/data/network/managed_vpn.onc
est/data/network/managed_vpn_without_recommended.onc
est/data/network/settings_with_normalization.json
est/data/network/shill_ethernet.json
est/data/network/shill_l2tpipsec.json
est/data/network/shill_l2tpipsec_clientcert.json
est/data/network/shill_openvpn.json
est/data/network/shill_openvpn_clientcert.json
est/data/network/shill_openvpn_with_errors.json
est/data/network/shill_wifi_clientcert.json
est/data/network/shill_wifi_clientref.json
est/data/network/shill_wifi_psk.json
est/data/network/shill_wifi_with_state.json
est/data/network/toplevel_openvpn_clientcert.onc
est/data/network/toplevel_partially_invalid.onc
est/data/network/toplevel_wifi_eap_clientcert.onc
est/data/network/toplevel_wifi_leap.onc
est/data/network/toplevel_wifi_open.onc
est/data/network/toplevel_wifi_remove.onc
est/data/network/toplevel_wifi_wep_proxy.onc
est/data/network/toplevel_wifi_wpa_psk.onc
est/data/network/toplevel_with_unknown_fields.onc
est/data/network/translation_of_shill_l2tpipsec.onc
est/data/network/translation_of_shill_openvpn_with_errors.onc
est/data/network/translation_of_shill_wifi_with_state.onc
est/data/network/user.onc
est/data/network/valid_l2tpipsec.onc
est/data/network/valid_l2tpipsec_clientcert.onc
est/data/network/valid_openvpn.onc
est/data/network/valid_openvpn_clientcert.onc
est/data/network/valid_wifi_clientcert.onc
est/data/network/valid_wifi_clientref.onc
est/data/network/valid_wifi_psk.onc
ools/onc_validator/OWNERS
ools/onc_validator/onc_validator.cc
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
EPS
WNERS
hromeos.gyp
hromeos_export.h
hromeos_switches.cc
hromeos_switches.h
ryptohome/async_method_caller.cc
ryptohome/async_method_caller.h
ryptohome/mock_async_method_caller.cc
ryptohome/mock_async_method_caller.h
bus/DEPS
bus/blocking_method_caller.cc
bus/blocking_method_caller.h
bus/blocking_method_caller_unittest.cc
bus/bluetooth_adapter_client.cc
bus/bluetooth_adapter_client.h
bus/bluetooth_agent_service_provider.cc
bus/bluetooth_agent_service_provider.h
bus/bluetooth_device_client.cc
bus/bluetooth_device_client.h
bus/bluetooth_input_client.cc
bus/bluetooth_input_client.h
bus/bluetooth_manager_client.cc
bus/bluetooth_manager_client.h
bus/bluetooth_node_client.cc
bus/bluetooth_node_client.h
bus/bluetooth_out_of_band_client.cc
bus/bluetooth_out_of_band_client.h
bus/bluetooth_property.cc
bus/bluetooth_property.h
bus/cashew_client.cc
bus/cashew_client.h
bus/cros_disks_client.cc
bus/cros_disks_client.h
bus/cryptohome_client.cc
bus/cryptohome_client.h
bus/dbus_client_implementation_type.h
bus/dbus_method_call_status.h
bus/dbus_thread_manager.cc
bus/dbus_thread_manager.h
bus/dbus_thread_manager_observer.h
bus/debug_daemon_client.cc
bus/debug_daemon_client.h
bus/gsm_sms_client.cc
bus/gsm_sms_client.h
bus/gsm_sms_client_unittest.cc
bus/ibus/OWNERS
bus/ibus/ibus_client.cc
bus/ibus/ibus_client.h
bus/ibus/ibus_client_unittest.cc
bus/ibus/ibus_component.cc
bus/ibus/ibus_component.h
bus/ibus/ibus_component_unittest.cc
bus/ibus/ibus_config_client.cc
bus/ibus/ibus_config_client.h
bus/ibus/ibus_config_client_unittest.cc
bus/ibus/ibus_constants.h
bus/ibus/ibus_engine_factory_service.cc
bus/ibus/ibus_engine_factory_service.h
bus/ibus/ibus_engine_factory_service_unittest.cc
bus/ibus/ibus_engine_service.cc
bus/ibus/ibus_engine_service.h
bus/ibus/ibus_engine_service_unittest.cc
bus/ibus/ibus_input_context_client.cc
bus/ibus/ibus_input_context_client.h
bus/ibus/ibus_input_context_client_unittest.cc
bus/ibus/ibus_lookup_table.cc
bus/ibus/ibus_lookup_table.h
bus/ibus/ibus_lookup_table_unittest.cc
bus/ibus/ibus_object.cc
bus/ibus/ibus_object.h
bus/ibus/ibus_object_unittest.cc
bus/ibus/ibus_panel_service.cc
bus/ibus/ibus_panel_service.h
bus/ibus/ibus_panel_service_unittest.cc
bus/ibus/ibus_property.cc
bus/ibus/ibus_property.h
bus/ibus/ibus_property_unittest.cc
bus/ibus/ibus_text.cc
bus/ibus/ibus_text.h
bus/ibus/ibus_text_unittest.cc
bus/ibus/mock_ibus_client.cc
bus/ibus/mock_ibus_client.h
bus/ibus/mock_ibus_config_client.cc
bus/ibus/mock_ibus_config_client.h
bus/ibus/mock_ibus_engine_factory_service.cc
bus/ibus/mock_ibus_engine_factory_service.h
bus/ibus/mock_ibus_engine_service.cc
bus/ibus/mock_ibus_engine_service.h
bus/ibus/mock_ibus_input_context_client.cc
bus/ibus/mock_ibus_input_context_client.h
bus/ibus/mock_ibus_panel_service.cc
bus/ibus/mock_ibus_panel_service.h
bus/image_burner_client.cc
bus/image_burner_client.h
bus/introspectable_client.cc
bus/introspectable_client.h
bus/introspectable_client_unittest.cc
bus/mock_bluetooth_adapter_client.cc
bus/mock_bluetooth_adapter_client.h
bus/mock_bluetooth_device_client.cc
bus/mock_bluetooth_device_client.h
bus/mock_bluetooth_input_client.cc
bus/mock_bluetooth_input_client.h
bus/mock_bluetooth_manager_client.cc
bus/mock_bluetooth_manager_client.h
bus/mock_bluetooth_node_client.cc
bus/mock_bluetooth_node_client.h
bus/mock_bluetooth_out_of_band_client.cc
bus/mock_bluetooth_out_of_band_client.h
bus/mock_cashew_client.cc
bus/mock_cashew_client.h
bus/mock_cros_disks_client.cc
bus/mock_cros_disks_client.h
bus/mock_cryptohome_client.cc
bus/mock_cryptohome_client.h
bus/mock_dbus_thread_manager.cc
bus/mock_dbus_thread_manager.h
bus/mock_dbus_thread_manager_without_gmock.cc
bus/mock_dbus_thread_manager_without_gmock.h
bus/mock_debug_daemon_client.cc
bus/mock_debug_daemon_client.h
bus/mock_gsm_sms_client.cc
bus/mock_gsm_sms_client.h
bus/mock_image_burner_client.cc
bus/mock_image_burner_client.h
bus/mock_introspectable_client.cc
bus/mock_introspectable_client.h
bus/mock_modem_messaging_client.cc
bus/mock_modem_messaging_client.h
bus/mock_permission_broker_client.cc
bus/mock_permission_broker_client.h
bus/mock_power_manager_client.cc
bus/mock_power_manager_client.h
bus/mock_session_manager_client.cc
bus/mock_session_manager_client.h
bus/mock_shill_device_client.cc
bus/mock_shill_device_client.h
bus/mock_shill_ipconfig_client.cc
bus/mock_shill_ipconfig_client.h
bus/mock_shill_manager_client.cc
bus/mock_shill_manager_client.h
bus/mock_shill_network_client.cc
bus/mock_shill_network_client.h
bus/mock_shill_profile_client.cc
bus/mock_shill_profile_client.h
bus/mock_shill_service_client.cc
bus/mock_shill_service_client.h
bus/mock_sms_client.cc
bus/mock_sms_client.h
bus/mock_speech_synthesizer_client.cc
bus/mock_speech_synthesizer_client.h
bus/mock_update_engine_client.cc
bus/mock_update_engine_client.h
bus/modem_messaging_client.cc
bus/modem_messaging_client.h
bus/modem_messaging_client_unittest.cc
bus/permission_broker_client.cc
bus/permission_broker_client.h
bus/power_manager_client.cc
bus/power_manager_client.h
bus/power_supply_status.cc
bus/power_supply_status.h
bus/session_manager_client.cc
bus/session_manager_client.h
bus/shill_client_helper.cc
bus/shill_client_helper.h
bus/shill_client_unittest_base.cc
bus/shill_client_unittest_base.h
bus/shill_device_client.cc
bus/shill_device_client.h
bus/shill_device_client_unittest.cc
bus/shill_ipconfig_client.cc
bus/shill_ipconfig_client.h
bus/shill_ipconfig_client_unittest.cc
bus/shill_manager_client.cc
bus/shill_manager_client.h
bus/shill_manager_client_unittest.cc
bus/shill_network_client.cc
bus/shill_network_client.h
bus/shill_network_client_unittest.cc
bus/shill_profile_client.cc
bus/shill_profile_client.h
bus/shill_profile_client_unittest.cc
bus/shill_property_changed_observer.h
bus/shill_service_client.cc
bus/shill_service_client.h
bus/shill_service_client_unittest.cc
bus/sms_client.cc
bus/sms_client.h
bus/speech_synthesizer_client.cc
bus/speech_synthesizer_client.h
bus/update_engine_client.cc
bus/update_engine_client.h
isks/disk_mount_manager.cc
isks/disk_mount_manager.h
isks/mock_disk_mount_manager.cc
isks/mock_disk_mount_manager.h
isplay/OWNERS
isplay/output_configurator.cc
isplay/output_configurator.h
isplay/output_configurator_unittest.cc
etwork/DEPS
etwork/device_state.cc
etwork/device_state.h
etwork/managed_state.cc
etwork/managed_state.h
etwork/network_sms_handler.cc
etwork/network_sms_handler.h
etwork/network_sms_handler_unittest.cc
etwork/network_state.cc
etwork/network_state.h
etwork/network_state_handler.cc
etwork/network_state_handler.h
etwork/network_state_handler_observer.cc
etwork/network_state_handler_observer.h
etwork/network_state_handler_unittest.cc
etwork/shill_property_handler.cc
etwork/shill_property_handler.h
etwork/shill_property_handler_unittest.cc
etwork/shill_service_observer.cc
etwork/shill_service_observer.h
ower/power_state_override.cc
ower/power_state_override.h
ower/power_state_override_unittest.cc