Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea

1 files changed, 19 insertions, 37 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 7ee159104b..0328301379 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -41,7 +41,6 @@
         '<(DEPTH)/components/components.gyp:variations',
         '<(DEPTH)/components/components.gyp:visitedlink_common',
         '<(DEPTH)/content/content.gyp:content_common',
-        '<(DEPTH)/extensions/extensions.gyp:extensions_common',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
@@ -49,7 +48,7 @@
         '<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/third_party/zlib/google/zip.gyp:zip',
-        '<(DEPTH)/ui/ui.gyp:ui_resources',
+        '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources',
         '<(DEPTH)/url/url.gyp:url_lib',
         '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
       ],
@@ -146,8 +145,12 @@
         'common/extensions/api/omnibox/omnibox_handler.h',
         'common/extensions/api/plugins/plugins_handler.cc',
         'common/extensions/api/plugins/plugins_handler.h',
-        'common/extensions/api/sockets/sockets_handler.cc',
-        'common/extensions/api/sockets/sockets_handler.h',
+        'common/extensions/api/sockets/sockets_manifest_handler.cc',
+        'common/extensions/api/sockets/sockets_manifest_handler.h',
+        'common/extensions/api/sockets/sockets_manifest_data.cc',
+        'common/extensions/api/sockets/sockets_manifest_data.h',
+        'common/extensions/api/sockets/sockets_manifest_permission.cc',
+        'common/extensions/api/sockets/sockets_manifest_permission.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',
@@ -158,21 +161,13 @@
         '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/background_info.cc',
-        'common/extensions/background_info.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/command.cc',
         'common/extensions/command.h',
-        'common/extensions/csp_handler.cc',
-        'common/extensions/csp_handler.h',
-        'common/extensions/csp_validator.cc',
-        'common/extensions/csp_validator.h',
         'common/extensions/dom_action_types.h',
-        'common/extensions/extension.cc',
-        'common/extensions/extension.h',
         'common/extensions/extension_constants.cc',
         'common/extensions/extension_constants.h',
         'common/extensions/extension_file_util.cc',
@@ -187,8 +182,6 @@
         'common/extensions/extension_process_policy.h',
         'common/extensions/extension_set.cc',
         'common/extensions/extension_set.h',
-        'common/extensions/feature_switch.cc',
-        'common/extensions/feature_switch.h',
         'common/extensions/features/api_feature.cc',
         'common/extensions/features/api_feature.h',
         'common/extensions/features/base_feature_provider.cc',
@@ -203,10 +196,6 @@
         'common/extensions/features/permission_feature.h',
         'common/extensions/features/simple_feature.cc',
         'common/extensions/features/simple_feature.h',
-        'common/extensions/incognito_handler.cc',
-        'common/extensions/incognito_handler.h',
-        'common/extensions/manifest_handler.cc',
-        'common/extensions/manifest_handler.h',
         'common/extensions/manifest_handler_helpers.cc',
         'common/extensions/manifest_handler_helpers.h',
         'common/extensions/manifest_handlers/app_isolation_info.cc',
@@ -219,22 +208,12 @@
         'common/extensions/manifest_handlers/externally_connectable.h',
         'common/extensions/manifest_handlers/icons_handler.cc',
         'common/extensions/manifest_handlers/icons_handler.h',
-        'common/extensions/manifest_handlers/kiosk_mode_info.cc',
-        'common/extensions/manifest_handlers/kiosk_mode_info.h',
         'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
         'common/extensions/manifest_handlers/minimum_chrome_version_checker.h',
         'common/extensions/manifest_handlers/nacl_modules_handler.cc',
         'common/extensions/manifest_handlers/nacl_modules_handler.h',
-        'common/extensions/manifest_handlers/offline_enabled_info.cc',
-        'common/extensions/manifest_handlers/offline_enabled_info.h',
-        'common/extensions/manifest_handlers/requirements_handler.cc',
-        'common/extensions/manifest_handlers/requirements_handler.h',
-        'common/extensions/manifest_handlers/sandboxed_page_info.cc',
-        'common/extensions/manifest_handlers/sandboxed_page_info.h',
         'common/extensions/manifest_handlers/settings_overrides_handler.cc',
         'common/extensions/manifest_handlers/settings_overrides_handler.h',
-        'common/extensions/manifest_handlers/shared_module_info.cc',
-        'common/extensions/manifest_handlers/shared_module_info.h',
         'common/extensions/manifest_handlers/theme_handler.cc',
         'common/extensions/manifest_handlers/theme_handler.h',
         'common/extensions/manifest_url_handler.cc',
@@ -257,9 +236,9 @@
         'common/extensions/permissions/media_galleries_permission_data.h',
         'common/extensions/permissions/permission_message_util.cc',
         'common/extensions/permissions/permission_message_util.h',
-        'common/extensions/permissions/permissions_data.cc',
-        'common/extensions/permissions/permissions_data.h',
         'common/extensions/permissions/set_disjunction_permission.h',
+        'common/extensions/permissions/settings_override_permission.cc',
+        'common/extensions/permissions/settings_override_permission.h',
         'common/extensions/permissions/socket_permission.cc',
         'common/extensions/permissions/socket_permission.h',
         'common/extensions/permissions/socket_permission_data.cc',
@@ -338,6 +317,8 @@
         'common/metrics/metrics_log_manager.h',
         'common/metrics/metrics_service_base.cc',
         'common/metrics/metrics_service_base.h',
+        'common/metrics/variations/experiment_labels_win.cc',
+        'common/metrics/variations/experiment_labels_win.h',
         'common/metrics/variations/uniformity_field_trials.cc',
         'common/metrics/variations/uniformity_field_trials.h',
         'common/metrics/variations/variations_util.cc',
@@ -403,11 +384,6 @@
         'common/web_application_info.h',
         'common/worker_thread_ticker.cc',
         'common/worker_thread_ticker.h',
-        '../components/nacl/common/nacl_host_messages.h',
-        '../components/nacl/common/nacl_process_type.h',
-        '../components/nacl/common/nacl_sandbox_type_mac.h',
-        '../components/nacl/common/pnacl_types.cc',
-        '../components/nacl/common/pnacl_types.h',
       ],
       'conditions': [
         ['enable_extensions==1', {
@@ -450,10 +426,11 @@
         ['OS != "ios"', {
           'dependencies': [
             '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
+            '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
             '<(DEPTH)/components/components.gyp:autofill_core_common',
-            '<(DEPTH)/components/nacl_common.gyp:nacl_common',
+            '<(DEPTH)/components/nacl.gyp:nacl_common',
+            '<(DEPTH)/extensions/extensions.gyp:extensions_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
-            '<(DEPTH)/printing/printing.gyp:printing',
             '<(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',
@@ -490,6 +467,11 @@
             '<(DEPTH)/breakpad/src',
           ],
         }],
+        ['enable_printing!=0', {
+          'dependencies': [
+            '<(DEPTH)/printing/printing.gyp:printing',
+          ],
+        }],
         ['OS!="ios" and chrome_multiple_dll!=1', {
           'dependencies': [
             '<(DEPTH)/webkit/glue/webkit_glue.gyp:glue',