Merge from Chromium at DEPS revision r200144
This commit was generated by merge_to_master.py.
Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index d1dcc27..4a7bcc0 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -41,7 +41,6 @@
'<(DEPTH)/content/content.gyp:content_common',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/skia/skia.gyp:skia',
- '<(DEPTH)/third_party/bzip2/bzip2.gyp:bzip2',
'<(DEPTH)/third_party/icu/icu.gyp:icui18n',
'<(DEPTH)/third_party/icu/icu.gyp:icuuc',
'<(DEPTH)/third_party/libxml/libxml.gyp:libxml',
@@ -110,7 +109,6 @@
'common/automation_messages_internal.h',
'common/badge_util.cc',
'common/badge_util.h',
- 'common/bzip2_error_handler.cc',
'common/cancelable_task_tracker.cc',
'common/cancelable_task_tracker.h',
'common/child_process_logging.h',
@@ -401,6 +399,7 @@
'common/service_process_util_win.cc',
'common/spellcheck_common.cc',
'common/spellcheck_common.h',
+ 'common/spellcheck_marker.h',
'common/spellcheck_messages.h',
'common/spellcheck_result.h',
'common/startup_metric_utils.cc',