Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 200 insertions, 64 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 87c894d415..6b4f375011 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -26,6 +26,7 @@
         # issue.
         'common_net',
         'common_version',
+        'installer_util',
         'metrics_proto',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
@@ -36,6 +37,7 @@
         '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings',
         '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources',
         '<(DEPTH)/chrome/common_constants.gyp:common_constants',
+        '<(DEPTH)/components/components.gyp:visitedlink_common',
         '<(DEPTH)/content/content.gyp:content_common',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
@@ -51,11 +53,49 @@
         '<(DEPTH)/webkit/support/webkit_support.gyp:user_agent',
       ],
       'sources': [
+        '../apps/app_shim/app_shim_messages.h',
+        '../extensions/common/constants.cc',
+        '../extensions/common/constants.h',
+        '../extensions/common/crx_file.cc',
+        '../extensions/common/crx_file.h',
+        '../extensions/common/draggable_region.cc',
+        '../extensions/common/draggable_region.h',
+        '../extensions/common/error_utils.cc',
+        '../extensions/common/error_utils.h',
+        '../extensions/common/event_filter.cc',
+        '../extensions/common/event_filter.h',
+        '../extensions/common/event_filtering_info.cc',
+        '../extensions/common/event_filtering_info.h',
+        '../extensions/common/event_matcher.cc',
+        '../extensions/common/event_matcher.h',
+        '../extensions/common/extension_resource.cc',
+        '../extensions/common/extension_resource.h',
+        '../extensions/common/id_util.cc',
+        '../extensions/common/id_util.h',
+        '../extensions/common/install_warning.h',
+        '../extensions/common/install_warning.cc',
+        '../extensions/common/matcher/regex_set_matcher.cc',
+        '../extensions/common/matcher/regex_set_matcher.h',
+        '../extensions/common/matcher/string_pattern.cc',
+        '../extensions/common/matcher/string_pattern.h',
+        '../extensions/common/matcher/substring_set_matcher.cc',
+        '../extensions/common/matcher/substring_set_matcher.h',
+        '../extensions/common/matcher/url_matcher.cc',
+        '../extensions/common/matcher/url_matcher.h',
+        '../extensions/common/matcher/url_matcher_constants.cc',
+        '../extensions/common/matcher/url_matcher_constants.h',
+        '../extensions/common/matcher/url_matcher_factory.cc',
+        '../extensions/common/matcher/url_matcher_factory.h',
+        '../extensions/common/matcher/url_matcher_helpers.cc',
+        '../extensions/common/matcher/url_matcher_helpers.h',
+        '../extensions/common/url_pattern.cc',
+        '../extensions/common/url_pattern.h',
+        '../extensions/common/url_pattern_set.cc',
+        '../extensions/common/url_pattern_set.h',
         'common/all_messages.h',
         'common/attrition_experiments.h',
         'common/auto_start_linux.cc',
         'common/auto_start_linux.h',
-        'common/autofill_messages.h',
         'common/automation_constants.cc',
         'common/automation_constants.h',
         'common/automation_events.cc',
@@ -76,8 +116,10 @@
         'common/child_process_logging_win.cc',
         'common/chrome_content_client.cc',
         'common/chrome_content_client.h',
+        'common/chrome_content_client_ios.mm',
         'common/chrome_notification_types.h',
         'common/chrome_result_codes.h',
+        'common/chrome_process_type.h',
         'common/chrome_sandbox_type_mac.h',
         'common/chrome_utility_messages.h',
         'common/chrome_version_info.cc',
@@ -89,6 +131,8 @@
         'common/chrome_version_info.h',
         'common/cloud_print/cloud_print_class_mac.h',
         'common/cloud_print/cloud_print_class_mac.mm',
+        'common/cloud_print/cloud_print_constants.cc',
+        'common/cloud_print/cloud_print_constants.h',
         'common/cloud_print/cloud_print_helpers.cc',
         'common/cloud_print/cloud_print_helpers.h',
         'common/cloud_print/cloud_print_proxy_info.cc',
@@ -107,27 +151,60 @@
         'common/content_settings_pattern_parser.cc',
         'common/content_settings_pattern_parser.h',
         'common/content_settings_types.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/dump_without_crashing.cc',
+        'common/dump_without_crashing.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/extension_action/script_badge_handler.cc',
+        'common/extensions/api/extension_action/script_badge_handler.h',
+        'common/extensions/api/extension_api.cc',
+        'common/extensions/api/extension_api.h',
+        'common/extensions/api/extension_api_stub.cc',
+        'common/extensions/api/file_handlers/file_handlers_parser.cc',
+        'common/extensions/api/file_handlers/file_handlers_parser.h',
+        'common/extensions/api/i18n/default_locale_handler.cc',
+        'common/extensions/api/i18n/default_locale_handler.h',
+        'common/extensions/api/icons/icons_handler.cc',
+        'common/extensions/api/icons/icons_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/omnibox/omnibox_handler.cc',
+        'common/extensions/api/omnibox/omnibox_handler.h',
+        'common/extensions/api/page_launcher/page_launcher_handler.cc',
+        'common/extensions/api/page_launcher/page_launcher_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/system_indicator/system_indicator_handler.cc',
+        'common/extensions/api/system_indicator/system_indicator_handler.h',
+        'common/extensions/api/themes/theme_handler.cc',
+        'common/extensions/api/themes/theme_handler.h',
+        'common/extensions/background_info.cc',
+        'common/extensions/background_info.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/draggable_region.cc',
-        'common/extensions/draggable_region.h',
-        'common/extensions/event_filter.cc',
-        'common/extensions/event_filter.h',
-        'common/extensions/event_filtering_info.cc',
-        'common/extensions/event_filtering_info.h',
-        'common/extensions/event_matcher.cc',
-        'common/extensions/event_matcher.h',
         'common/extensions/extension.cc',
         'common/extensions/extension.h',
         'common/extensions/extension_constants.cc',
         'common/extensions/extension_constants.h',
-        'common/extensions/extension_error_utils.cc',
-        'common/extensions/extension_error_utils.h',
         'common/extensions/extension_file_util.cc',
         'common/extensions/extension_file_util.h',
         'common/extensions/extension_icon_set.cc',
@@ -142,12 +219,14 @@
         'common/extensions/extension_messages.h',
         'common/extensions/extension_process_policy.cc',
         'common/extensions/extension_process_policy.h',
-        'common/extensions/extension_resource.cc',
-        'common/extensions/extension_resource.h',
         'common/extensions/extension_set.cc',
         'common/extensions/extension_set.h',
         'common/extensions/feature_switch.cc',
         'common/extensions/feature_switch.h',
+        'common/extensions/features/base_feature_provider.cc',
+        'common/extensions/features/base_feature_provider.h',
+        'common/extensions/features/complex_feature.cc',
+        'common/extensions/features/complex_feature.h',
         'common/extensions/features/feature.cc',
         'common/extensions/features/feature.h',
         'common/extensions/features/feature_provider.h',
@@ -155,79 +234,74 @@
         'common/extensions/features/manifest_feature.h',
         'common/extensions/features/permission_feature.cc',
         'common/extensions/features/permission_feature.h',
-        'common/extensions/features/simple_feature_provider.cc',
-        'common/extensions/features/simple_feature_provider.h',
-        'common/extensions/file_browser_handler.cc',
-        'common/extensions/file_browser_handler.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.cc',
         'common/extensions/manifest.h',
-        'common/extensions/matcher/regex_set_matcher.cc',
-        'common/extensions/matcher/regex_set_matcher.h',
-        'common/extensions/matcher/string_pattern.cc',
-        'common/extensions/matcher/string_pattern.h',
-        'common/extensions/matcher/substring_set_matcher.cc',
-        'common/extensions/matcher/substring_set_matcher.h',
-        'common/extensions/matcher/url_matcher.cc',
-        'common/extensions/matcher/url_matcher.h',
-        'common/extensions/matcher/url_matcher_constants.cc',
-        'common/extensions/matcher/url_matcher_constants.h',
-        'common/extensions/matcher/url_matcher_factory.cc',
-        'common/extensions/matcher/url_matcher_factory.h',
-        'common/extensions/matcher/url_matcher_helpers.cc',
-        'common/extensions/matcher/url_matcher_helpers.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/content_scripts_handler.cc',
+        'common/extensions/manifest_handlers/content_scripts_handler.h',
+        'common/extensions/manifest_url_handler.cc',
+        'common/extensions/manifest_url_handler.h',
         'common/extensions/message_bundle.cc',
         'common/extensions/message_bundle.h',
+        'common/extensions/mime_types_handler.cc',
+        'common/extensions/mime_types_handler.h',
         'common/extensions/permissions/api_permission.cc',
         'common/extensions/permissions/api_permission.h',
         'common/extensions/permissions/api_permission_set.cc',
         'common/extensions/permissions/api_permission_set.h',
+        'common/extensions/permissions/bluetooth_device_permission.cc',
+        'common/extensions/permissions/bluetooth_device_permission.h',
+        'common/extensions/permissions/bluetooth_device_permission_data.cc',
+        'common/extensions/permissions/bluetooth_device_permission_data.h',
+        'common/extensions/permissions/media_galleries_permission.cc',
+        'common/extensions/permissions/media_galleries_permission.h',
+        'common/extensions/permissions/media_galleries_permission_data.cc',
+        'common/extensions/permissions/media_galleries_permission_data.h',
         'common/extensions/permissions/permission_message.cc',
         'common/extensions/permissions/permission_message.h',
         'common/extensions/permissions/permission_set.cc',
         'common/extensions/permissions/permission_set.h',
         'common/extensions/permissions/permissions_info.cc',
         'common/extensions/permissions/permissions_info.h',
+        'common/extensions/permissions/set_disjunction_permission.h',
         'common/extensions/permissions/socket_permission.cc',
         'common/extensions/permissions/socket_permission.h',
         'common/extensions/permissions/socket_permission_data.cc',
         'common/extensions/permissions/socket_permission_data.h',
+        'common/extensions/permissions/usb_device_permission.cc',
+        'common/extensions/permissions/usb_device_permission.h',
+        'common/extensions/permissions/usb_device_permission_data.cc',
+        'common/extensions/permissions/usb_device_permission_data.h',
         'common/extensions/request_media_access_permission_helper.cc',
         'common/extensions/request_media_access_permission_helper.h',
         'common/extensions/unpacker.cc',
         'common/extensions/unpacker.h',
         'common/extensions/update_manifest.cc',
         'common/extensions/update_manifest.h',
-        'common/extensions/url_pattern.cc',
-        'common/extensions/url_pattern.h',
-        'common/extensions/url_pattern_set.cc',
-        'common/extensions/url_pattern_set.h',
         'common/extensions/user_script.cc',
         'common/extensions/user_script.h',
         'common/extensions/value_counter.cc',
         'common/extensions/value_counter.h',
-        'common/extensions/api/extension_api.cc',
-        'common/extensions/api/extension_api.h',
+        'common/extensions/web_accessible_resources_handler.cc',
+        'common/extensions/web_accessible_resources_handler.h',
         'common/external_ipc_fuzzer.h',
         'common/external_ipc_fuzzer.cc',
-        'common/favicon_url.cc',
-        'common/favicon_url.h',
-        'common/form_data.cc',
-        'common/form_data.h',
-        'common/form_data_predictions.cc',
-        'common/form_data_predictions.h',
-        'common/form_field_data.cc',
-        'common/form_field_data.h',
-        'common/form_field_data_predictions.cc',
-        'common/form_field_data_predictions.h',
-        'common/icon_messages.h',
+        'common/icon_with_badge_image_source.cc',
+        'common/icon_with_badge_image_source.h',
+        'common/instant_restricted_id_cache.h',
         'common/instant_types.cc',
         'common/instant_types.h',
-        'common/json_schema_constants.cc',
-        'common/json_schema_constants.h',
-        'common/json_schema_validator.cc',
-        'common/json_schema_validator.h',
-        'common/jstemplate_builder.cc',
-        'common/jstemplate_builder.h',
+        'common/json_schema/json_schema_constants.cc',
+        'common/json_schema/json_schema_constants.h',
+        'common/json_schema/json_schema_validator.cc',
+        'common/json_schema/json_schema_validator.h',
         'common/localized_error.cc',
         'common/localized_error.h',
         'common/logging_chrome.cc',
@@ -254,6 +328,8 @@
         'common/metrics/metrics_service_base.h',
         'common/metrics/metrics_util.cc',
         'common/metrics/metrics_util.h',
+        'common/metrics/variations/uniformity_field_trials.cc',
+        'common/metrics/variations/uniformity_field_trials.h',
         'common/metrics/variations/variations_util.cc',
         'common/metrics/variations/variations_util.h',
         'common/multi_process_lock.h',
@@ -266,10 +342,9 @@
         'common/nacl_messages.h',
         'common/nacl_types.cc',
         'common/nacl_types.h',
-        'common/password_form_fill_data.cc',
-        'common/password_form_fill_data.h',
-        'common/password_generation_util.cc',
-        'common/password_generation_util.h',
+        'common/omaha_query_params.cc',
+        'common/omaha_query_params.h',
+        'common/one_click_signin_messages.h',
         'common/pepper_flash.cc',
         'common/pepper_flash.h',
         'common/pref_names_util.cc',
@@ -281,8 +356,13 @@
         'common/ref_counted_util.h',
         'common/render_messages.cc',
         'common/render_messages.h',
+        'common/safe_browsing/download_protection_util.cc',
+        'common/safe_browsing/download_protection_util.h',
         'common/safe_browsing/safebrowsing_messages.h',
+        'common/safe_browsing/zip_analyzer.cc',
+        'common/safe_browsing/zip_analyzer.h',
         'common/search_provider.h',
+        'common/search_types.h',
         'common/service_messages.h',
         'common/service_process_util.cc',
         'common/service_process_util.h',
@@ -307,8 +387,6 @@
         'common/url_constants.h',
         'common/view_type.cc',
         'common/view_type.h',
-        'common/visitedlink_common.cc',
-        'common/visitedlink_common.h',
         'common/web_apps.cc',
         'common/web_apps.h',
         'common/web_resource/web_resource_unpacker.cc',
@@ -323,10 +401,42 @@
         'common/zip_reader.h',
       ],
       'conditions': [
+        ['enable_extensions==1', {
+          'sources!': [
+            'common/extensions/api/extension_api_stub.cc',
+          ],
+          'dependencies': [
+            '../device/device.gyp:device_usb',
+          ],
+        }, {  # enable_extensions == 0
+          'sources/': [
+            ['exclude', '^common/extensions/api/'],
+            ['include', 'common/extensions/api/extension_api_stub.cc'],
+            ['include', 'common/extensions/api/extension_action/action_info.cc'],
+            ['include', 'common/extensions/api/extension_action/action_info.h'],
+            ['include', 'common/extensions/api/extension_action/browser_action_handler.cc'],
+            ['include', 'common/extensions/api/extension_action/browser_action_handler.h'],
+            ['include', 'common/extensions/api/content_scripts/content_scripts_handler.cc'],
+            ['include', 'common/extensions/api/content_scripts/content_scripts_handler.h'],
+            ['include', 'common/extensions/api/extension_action/page_action_handler.cc'],
+            ['include', 'common/extensions/api/extension_action/page_action_handler.h'],
+            ['include', 'common/extensions/api/icons/icons_handler.cc'],
+            ['include', 'common/extensions/api/icons/icons_handler.h'],
+            ['include', 'common/extensions/api/i18n/default_locale_handler.cc'],
+            ['include', 'common/extensions/api/i18n/default_locale_handler.h'],
+            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.cc'],
+            ['include', 'common/extensions/api/identity/oauth2_manifest_handler.h'],
+            ['include', 'common/extensions/api/plugins/plugins_handler.cc'],
+            ['include', 'common/extensions/api/plugins/plugins_handler.h'],
+            ['include', 'common/extensions/api/themes/theme_handler.cc'],
+            ['include', 'common/extensions/api/themes/theme_handler.h'],
+          ],
+        }],
         ['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_common',
             '<(DEPTH)/ipc/ipc.gyp:ipc',
             '<(DEPTH)/printing/printing.gyp:printing',
             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',
@@ -336,7 +446,6 @@
           ],
         }, {  # OS == ios
           'sources/': [
-            ['exclude', '^common/automation_'],
             ['exclude', '^common/child_process_'],
             ['exclude', '^common/chrome_content_client\\.cc$'],
             ['exclude', '^common/chrome_version_info_posix\\.cc$'],
@@ -356,7 +465,11 @@
             # TODO(ios): Include files here as they are made to work; once
             # everything is online, remove everything below here and just
             # use the exclusions above.
-            ['exclude', '.*'],
+            ['exclude', '\\.(cc|mm)$'],
+            ['include', '_ios\\.(cc|mm)$'],
+            ['include', '(^|/)ios/'],
+            ['include', '^common/chrome_version_info\\.cc$'],
+            ['include', '^common/zip'],
           ],
         }],
         ['OS=="android"', {
@@ -371,7 +484,11 @@
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
-          ]
+          ],
+          'sources!': [
+            'common/crash_keys.cc',
+            'common/crash_keys.h',
+          ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
@@ -416,6 +533,16 @@
             '../remoting/remoting.gyp:remoting_client_plugin',
           ],
         }],
+        ['enable_automation==0', {
+          'sources/': [
+            ['exclude', '^common/automation_']
+          ]
+        }],
+        ['use_system_nspr==1', {
+          'dependencies': [
+            '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr',
+          ],
+        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
@@ -423,6 +550,7 @@
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^common/chrome_version_info_mac\\.mm$'],
+            ['include', '^common/mac/nscoder_util\\.'],
           ],
         }],
       ],
@@ -495,6 +623,8 @@
       'target_name': 'common_net',
       'type': 'static_library',
       'sources': [
+        'common/net/net_error_tracker.cc',
+        'common/net/net_error_tracker.h',
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
         'common/net/predictor_common.h',
@@ -556,6 +686,11 @@
             ],
           },
         ],
+        ['OS=="win"', {
+            # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+            'msvs_disabled_warnings': [4267, ],
+          },
+        ],
       ],
     },
     {
@@ -583,6 +718,7 @@
         'common/metrics/proto/chrome_user_metrics_extension.proto',
         'common/metrics/proto/histogram_event.proto',
         'common/metrics/proto/omnibox_event.proto',
+        'common/metrics/proto/perf_data.proto',
         'common/metrics/proto/profiler_event.proto',
         'common/metrics/proto/system_profile.proto',
         'common/metrics/proto/user_action_event.proto',