Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 29f10ca..7856327 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -36,6 +36,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:breakpad_common',
'<(DEPTH)/components/components.gyp:visitedlink_common',
'<(DEPTH)/content/content.gyp:content_common',
'<(DEPTH)/net/net.gyp:net',
@@ -375,6 +376,7 @@
'common/multi_process_lock_win.cc',
'common/nacl_cmd_line.cc',
'common/nacl_cmd_line.h',
+ 'common/nacl_host_messages.h',
'common/nacl_messages.cc',
'common/nacl_messages.h',
'common/nacl_types.cc',
@@ -387,6 +389,8 @@
'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/print_messages.cc',
@@ -476,7 +480,7 @@
'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)/components/components.gyp:autofill_core_common',
'<(DEPTH)/ipc/ipc.gyp:ipc',
'<(DEPTH)/printing/printing.gyp:printing',
'<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',