Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e

1 files changed, 62 insertions, 70 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index ddf250aba0..83783c7ef1 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -6,8 +6,6 @@
   'variables': {
     # File lists shared with GN build.
     'chrome_common_sources': [
-      '../apps/app_shim/app_shim_launch.h',
-      '../apps/app_shim/app_shim_messages.h',
       'common/all_messages.h',
       'common/attrition_experiments.h',
       'common/auto_start_linux.cc',
@@ -46,41 +44,21 @@
       'common/common_param_traits.h',
       'common/common_param_traits_macros.h',
       'common/content_restriction.h',
-      'common/content_settings.cc',
-      'common/content_settings.h',
-      'common/content_settings_pattern.cc',
-      'common/content_settings_pattern.h',
-      'common/content_settings_pattern_parser.cc',
-      'common/content_settings_pattern_parser.h',
+      'common/content_settings_pattern_serializer.cc',
+      'common/content_settings_pattern_serializer.h',
       'common/crash_keys.cc',
       'common/crash_keys.h',
       'common/custom_handlers/protocol_handler.cc',
       'common/custom_handlers/protocol_handler.h',
       'common/descriptors_android.h',
-      'common/extensions/api/extension_action/action_info.cc',
-      'common/extensions/api/extension_action/action_info.h',
-      'common/extensions/api/i18n/default_locale_handler.cc',
-      'common/extensions/api/i18n/default_locale_handler.h',
-      'common/extensions/api/identity/oauth2_manifest_handler.cc',
-      'common/extensions/api/identity/oauth2_manifest_handler.h',
-      'common/extensions/api/plugins/plugins_handler.cc',
-      'common/extensions/api/plugins/plugins_handler.h',
-      'common/extensions/api/storage/storage_schema_manifest_handler.cc',
-      'common/extensions/api/storage/storage_schema_manifest_handler.h',
-      'common/extensions/api/supervised_user_private/supervised_user_handler.cc',
-      'common/extensions/api/supervised_user_private/supervised_user_handler.h',
       'common/extensions/chrome_extension_messages.h',
       'common/extensions/chrome_extensions_client.cc',
       'common/extensions/chrome_extensions_client.h',
-      'common/extensions/chrome_manifest_handlers.cc',
-      'common/extensions/chrome_manifest_handlers.h',
       'common/extensions/chrome_utility_extensions_messages.h',
       'common/extensions/command.cc',
       'common/extensions/command.h',
       'common/extensions/extension_constants.cc',
       'common/extensions/extension_constants.h',
-      'common/extensions/extension_file_util.cc',
-      'common/extensions/extension_file_util.h',
       'common/extensions/extension_process_policy.cc',
       'common/extensions/extension_process_policy.h',
       'common/extensions/features/chrome_channel_feature_filter.cc',
@@ -89,28 +67,6 @@
       'common/extensions/features/feature_channel.h',
       'common/extensions/image_writer/image_writer_util_mac.cc',
       'common/extensions/image_writer/image_writer_util_mac.h',
-      'common/extensions/manifest_handlers/app_isolation_info.cc',
-      'common/extensions/manifest_handlers/app_isolation_info.h',
-      'common/extensions/manifest_handlers/app_launch_info.cc',
-      'common/extensions/manifest_handlers/app_launch_info.h',
-      'common/extensions/manifest_handlers/automation.h',
-      'common/extensions/manifest_handlers/automation.cc',
-      'common/extensions/manifest_handlers/content_scripts_handler.cc',
-      'common/extensions/manifest_handlers/content_scripts_handler.h',
-      'common/extensions/manifest_handlers/mime_types_handler.cc',
-      'common/extensions/manifest_handlers/mime_types_handler.h',
-      'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
-      'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
-      'common/extensions/manifest_handlers/settings_overrides_handler.cc',
-      'common/extensions/manifest_handlers/settings_overrides_handler.h',
-      'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc',
-      'common/extensions/manifest_handlers/synthesize_browser_action_handler.h',
-      'common/extensions/manifest_handlers/theme_handler.cc',
-      'common/extensions/manifest_handlers/theme_handler.h',
-      'common/extensions/manifest_handlers/ui_overrides_handler.cc',
-      'common/extensions/manifest_handlers/ui_overrides_handler.h',
-      'common/extensions/manifest_url_handler.cc',
-      'common/extensions/manifest_url_handler.h',
       'common/extensions/permissions/chrome_api_permissions.cc',
       'common/extensions/permissions/chrome_api_permissions.h',
       'common/extensions/permissions/chrome_permission_message_provider.cc',
@@ -132,6 +88,8 @@
       'common/logging_chrome.h',
       'common/mac/app_mode_common.h',
       'common/mac/app_mode_common.mm',
+      'common/mac/app_shim_launch.h',
+      'common/mac/app_shim_messages.h',
       'common/mac/cfbundle_blocker.h',
       'common/mac/cfbundle_blocker.mm',
       'common/mac/launchd.h',
@@ -149,10 +107,6 @@
       'common/omnibox_focus_state.h',
       'common/partial_circular_buffer.cc',
       'common/partial_circular_buffer.h',
-      'common/pepper_flash.cc',
-      'common/pepper_flash.h',
-      'common/pepper_permission_util.cc',
-      'common/pepper_permission_util.h',
       'common/pref_names_util.cc',
       'common/pref_names_util.h',
       'common/prerender_types.h',
@@ -194,36 +148,68 @@
       'common/worker_thread_ticker.h',
     ],
     'chrome_common_extensions_sources': [
-      'common/extensions/api/bluetooth/bluetooth_manifest_data.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_data.h',
-      'common/extensions/api/bluetooth/bluetooth_manifest_handler.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_handler.h',
-      'common/extensions/api/bluetooth/bluetooth_manifest_permission.cc',
-      'common/extensions/api/bluetooth/bluetooth_manifest_permission.h',
       'common/extensions/api/commands/commands_handler.cc',
       'common/extensions/api/commands/commands_handler.h',
+      'common/extensions/api/extension_action/action_info.cc',
+      'common/extensions/api/extension_action/action_info.h',
       'common/extensions/api/extension_action/browser_action_handler.cc',
       'common/extensions/api/extension_action/browser_action_handler.h',
       'common/extensions/api/extension_action/page_action_handler.cc',
       'common/extensions/api/extension_action/page_action_handler.h',
       'common/extensions/api/file_browser_handlers/file_browser_handler.cc',
       'common/extensions/api/file_browser_handlers/file_browser_handler.h',
+      'common/extensions/api/i18n/default_locale_handler.cc',
+      'common/extensions/api/i18n/default_locale_handler.h',
+      'common/extensions/api/identity/oauth2_manifest_handler.cc',
+      'common/extensions/api/identity/oauth2_manifest_handler.h',
       'common/extensions/api/input_ime/input_components_handler.cc',
       'common/extensions/api/input_ime/input_components_handler.h',
       'common/extensions/api/notifications/notification_style.cc',
       'common/extensions/api/notifications/notification_style.h',
       'common/extensions/api/omnibox/omnibox_handler.cc',
       'common/extensions/api/omnibox/omnibox_handler.h',
+      'common/extensions/api/plugins/plugins_handler.cc',
+      'common/extensions/api/plugins/plugins_handler.h',
       'common/extensions/api/speech/tts_engine_manifest_handler.cc',
       'common/extensions/api/speech/tts_engine_manifest_handler.h',
       'common/extensions/api/spellcheck/spellcheck_handler.cc',
       'common/extensions/api/spellcheck/spellcheck_handler.h',
+      'common/extensions/api/storage/storage_schema_manifest_handler.cc',
+      'common/extensions/api/storage/storage_schema_manifest_handler.h',
+      'common/extensions/api/supervised_user_private/supervised_user_handler.cc',
+      'common/extensions/api/supervised_user_private/supervised_user_handler.h',
       'common/extensions/api/system_indicator/system_indicator_handler.cc',
       'common/extensions/api/system_indicator/system_indicator_handler.h',
       'common/extensions/api/url_handlers/url_handlers_parser.cc',
       'common/extensions/api/url_handlers/url_handlers_parser.h',
       'common/extensions/api/webstore/webstore_api_constants.cc',
       'common/extensions/api/webstore/webstore_api_constants.h',
+      'common/extensions/chrome_manifest_handlers.cc',
+      'common/extensions/chrome_manifest_handlers.h',
+      'common/extensions/extension_file_util.cc',
+      'common/extensions/extension_file_util.h',
+      'common/extensions/manifest_handlers/app_isolation_info.cc',
+      'common/extensions/manifest_handlers/app_isolation_info.h',
+      'common/extensions/manifest_handlers/app_launch_info.cc',
+      'common/extensions/manifest_handlers/app_launch_info.h',
+      'common/extensions/manifest_handlers/automation.cc',
+      'common/extensions/manifest_handlers/automation.h',
+      'common/extensions/manifest_handlers/content_scripts_handler.cc',
+      'common/extensions/manifest_handlers/content_scripts_handler.h',
+      'common/extensions/manifest_handlers/mime_types_handler.cc',
+      'common/extensions/manifest_handlers/mime_types_handler.h',
+      'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
+      'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
+      'common/extensions/manifest_handlers/settings_overrides_handler.cc',
+      'common/extensions/manifest_handlers/settings_overrides_handler.h',
+      'common/extensions/manifest_handlers/synthesize_browser_action_handler.cc',
+      'common/extensions/manifest_handlers/synthesize_browser_action_handler.h',
+      'common/extensions/manifest_handlers/theme_handler.cc',
+      'common/extensions/manifest_handlers/theme_handler.h',
+      'common/extensions/manifest_handlers/ui_overrides_handler.cc',
+      'common/extensions/manifest_handlers/ui_overrides_handler.h',
+      'common/extensions/manifest_url_handler.cc',
+      'common/extensions/manifest_url_handler.h',
     ],
     'chrome_common_full_safe_browsing_sources': [
       'common/safe_browsing/download_protection_util.cc',
@@ -245,6 +231,8 @@
       'common/importer/imported_bookmark_entry.h',
       'common/importer/imported_favicon_usage.cc',
       'common/importer/imported_favicon_usage.h',
+      'common/importer/importer_autofill_form_data_entry.cc',
+      'common/importer/importer_autofill_form_data_entry.h',
       'common/importer/importer_bridge.cc',
       'common/importer/importer_bridge.h',
       'common/importer/importer_data_types.cc',
@@ -254,6 +242,7 @@
       'common/importer/importer_url_row.h',
       'common/importer/profile_import_process_messages.cc',
       'common/importer/profile_import_process_messages.h',
+      'common/importer/profile_import_process_param_traits_macros.h',
       'common/importer/safari_importer_utils.h',
       'common/importer/safari_importer_utils.mm',
     ],
@@ -347,8 +336,12 @@
         ['enable_extensions==1', {
           'sources': [ '<@(chrome_common_extensions_sources)' ],
           'dependencies': [
-            '../device/bluetooth/bluetooth.gyp:device_bluetooth',
-            '../device/usb/usb.gyp:device_usb',
+            '<(DEPTH)/device/usb/usb.gyp:device_usb',
+            '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
+            '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
+          ],
+          'export_dependent_settings': [
+            '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
           ],
         }],
         ['OS=="win" or OS=="mac"', {
@@ -365,7 +358,6 @@
         }],
         ['OS != "ios"', {
           'dependencies': [
-            '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
             '<(DEPTH)/components/components.gyp:autofill_content_common',
             '<(DEPTH)/components/components.gyp:password_manager_core_common',
@@ -373,16 +365,11 @@
             '<(DEPTH)/components/components.gyp:signin_core_common',
             '<(DEPTH)/components/components.gyp:translate_content_common',
             '<(DEPTH)/components/components.gyp:visitedlink_common',
-            '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
             '<(DEPTH)/extensions/extensions.gyp:extensions_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
-            '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
             '<(DEPTH)/third_party/re2/re2.gyp:re2',
             '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
           ],
-          'export_dependent_settings': [
-            '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
-          ],
         }, {  # OS == ios
           'sources/': [
             ['exclude', '^common/child_process_'],
@@ -395,7 +382,6 @@
             ['exclude', '^common/logging_chrome\\.'],
             ['exclude', '^common/media_galleries/'],
             ['exclude', '^common/multi_process_'],
-            ['exclude', '^common/pepper_flash\\.'],
             ['exclude', '^common/profiling\\.'],
             ['exclude', '^common/spellcheck_'],
             ['exclude', '^common/validation_message_'],
@@ -420,6 +406,17 @@
             '<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_trusted_plugin',
           ],
         }],
+        ['enable_plugins==1', {
+          'dependencies': [
+            '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
+          ],
+          'sources': [
+            'common/pepper_flash.cc',
+            'common/pepper_flash.h',
+            'common/pepper_permission_util.cc',
+            'common/pepper_permission_util.h',
+          ],
+        }],
         ['enable_printing==0', {
           'sources!': [
             'common/print_messages.cc',
@@ -476,11 +473,6 @@
               'common/local_discovery/local_discovery_messages.h',
             ]
         }],
-        ['chromeos==1', {
-          'sources!': [
-            'common/chrome_version_info_linux.cc',
-          ],
-        }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',