Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 26 insertions, 16 deletions

diff --git a/chromium/chromeos/chromeos.gyp b/chromium/chromeos/chromeos.gyp
index 00dd7787217..3dc7a825fd5 100644
--- a/chromium/chromeos/chromeos.gyp
+++ b/chromium/chromeos/chromeos.gyp
@@ -137,12 +137,12 @@
         'dbus/shill_service_client.h',
         'dbus/shill_service_client_stub.cc',
         'dbus/shill_service_client_stub.h',
+        'dbus/shill_stub_helper.cc',
+        'dbus/shill_stub_helper.h',
         'dbus/ibus/ibus_client.cc',
         'dbus/ibus/ibus_client.h',
         'dbus/ibus/ibus_component.cc',
         'dbus/ibus/ibus_component.h',
-        'dbus/ibus/ibus_config_client.cc',
-        'dbus/ibus/ibus_config_client.h',
         'dbus/ibus/ibus_constants.h',
         'dbus/ibus/ibus_engine_service.cc',
         'dbus/ibus/ibus_engine_service.h',
@@ -158,8 +158,6 @@
         'dbus/ibus/ibus_text.h',
         'dbus/ibus/ibus_input_context_client.cc',
         'dbus/ibus/ibus_input_context_client.h',
-        'dbus/ibus/ibus_panel_service.cc',
-        'dbus/ibus/ibus_panel_service.h',
         'dbus/image_burner_client.cc',
         'dbus/image_burner_client.h',
         'dbus/introspectable_client.cc',
@@ -217,10 +215,10 @@
         'login/login_state.h',
         'network/certificate_pattern.cc',
         'network/certificate_pattern.h',
+        'network/client_cert_resolver.cc',
+        'network/client_cert_resolver.h',
         'network/client_cert_util.cc',
         'network/client_cert_util.h',
-        'network/cros_network_functions.cc',
-        'network/cros_network_functions.h',
         'network/device_state.cc',
         'network/device_state.h',
         'network/favorite_state.cc',
@@ -229,8 +227,12 @@
         'network/geolocation_handler.h',
         'network/managed_network_configuration_handler.cc',
         'network/managed_network_configuration_handler.h',
+        'network/managed_network_configuration_handler_impl.cc',
+        'network/managed_network_configuration_handler_impl.h',
         'network/managed_state.cc',
         'network/managed_state.h',
+	'network/network_activation_handler.cc',
+	'network/network_activation_handler.h',
         'network/network_cert_migrator.cc',
         'network/network_cert_migrator.h',
         'network/network_change_notifier_chromeos.cc',
@@ -290,10 +292,14 @@
         'network/onc/onc_utils.h',
         'network/onc/onc_validator.cc',
         'network/onc/onc_validator.h',
+        'network/policy_util.cc',
+        'network/policy_util.h',
+        'network/policy_applicator.cc',
+        'network/policy_applicator.h',
         'network/shill_property_handler.cc',
         'network/shill_property_handler.h',
-        'network/sms_watcher.cc',
-        'network/sms_watcher.h',
+        'network/shill_property_util.cc',
+        'network/shill_property_util.h',
         'network/dhcp_proxy_script_fetcher_chromeos.cc',
         'network/dhcp_proxy_script_fetcher_chromeos.h',
         'process_proxy/process_output_watcher.cc',
@@ -379,6 +385,8 @@
         'disks/mock_disk_mount_manager.h',
         'ime/mock_component_extension_ime_manager_delegate.cc',
         'ime/mock_component_extension_ime_manager_delegate.h',
+        'network/mock_managed_network_configuration_handler.cc',
+        'network/mock_managed_network_configuration_handler.h',
         'network/onc/mock_certificate_importer.cc',
         'network/onc/mock_certificate_importer.h',
         'network/onc/onc_test_utils.cc',
@@ -422,20 +430,24 @@
         'dbus/mock_dbus_thread_manager_without_gmock.h',
         'dbus/ibus/mock_ibus_client.cc',
         'dbus/ibus/mock_ibus_client.h',
-        'dbus/ibus/mock_ibus_config_client.cc',
-        'dbus/ibus/mock_ibus_config_client.h',
         'dbus/ibus/mock_ibus_input_context_client.cc',
         'dbus/ibus/mock_ibus_input_context_client.h',
         'dbus/ibus/mock_ibus_engine_factory_service.cc',
         'dbus/ibus/mock_ibus_engine_factory_service.h',
         'dbus/ibus/mock_ibus_engine_service.cc',
         'dbus/ibus/mock_ibus_engine_service.h',
-        'dbus/ibus/mock_ibus_panel_service.cc',
-        'dbus/ibus/mock_ibus_panel_service.h',
         'ime/fake_input_method_delegate.cc',
         'ime/fake_input_method_delegate.h',
         'ime/mock_ibus_daemon_controller.cc',
         'ime/mock_ibus_daemon_controller.h',
+        'ime/mock_ime_candidate_window_handler.cc',
+        'ime/mock_ime_candidate_window_handler.h',
+        'ime/mock_ime_engine_handler.cc',
+        'ime/mock_ime_engine_handler.h',
+        'ime/mock_ime_input_context_handler.cc',
+        'ime/mock_ime_input_context_handler.h',
+        'ime/mock_ime_property_handler.cc',
+        'ime/mock_ime_property_handler.h',
         'ime/mock_xkeyboard.cc',
         'ime/mock_xkeyboard.h',
       ],
@@ -470,13 +482,10 @@
         'dbus/gsm_sms_client_unittest.cc',
         'dbus/ibus/ibus_client_unittest.cc',
         'dbus/ibus/ibus_component_unittest.cc',
-        'dbus/ibus/ibus_config_client_unittest.cc',
         'dbus/ibus/ibus_engine_factory_service_unittest.cc',
-        'dbus/ibus/ibus_engine_service_unittest.cc',
         'dbus/ibus/ibus_input_context_client_unittest.cc',
         'dbus/ibus/ibus_lookup_table_unittest.cc',
         'dbus/ibus/ibus_object_unittest.cc',
-        'dbus/ibus/ibus_panel_service_unittest.cc',
         'dbus/ibus/ibus_property_unittest.cc',
         'dbus/ibus/ibus_text_unittest.cc',
         'dbus/introspectable_client_unittest.cc',
@@ -499,7 +508,7 @@
         'ime/input_method_whitelist_unittest.cc',
         'ime/xkeyboard_unittest.cc',
         'login/login_state_unittest.cc',
-        'network/cros_network_functions_unittest.cc',
+        'network/client_cert_resolver_unittest.cc',
         'network/geolocation_handler_unittest.cc',
         'network/managed_network_configuration_handler_unittest.cc',
         'network/network_cert_migrator_unittest.cc',
@@ -521,6 +530,7 @@
         'network/onc/onc_utils_unittest.cc',
         'network/onc/onc_validator_unittest.cc',
         'network/shill_property_handler_unittest.cc',
+        'network/shill_property_util_unittest.cc',
         'process_proxy/process_output_watcher_unittest.cc',
         'process_proxy/process_proxy_unittest.cc',
         'system/name_value_pairs_parser_unittest.cc',