commit 9ab5563a3196760eb381d102cbb2bc0f7abc6a50
author Ben Murdoch <benm@google.com> Thu Jul 18 11:57:30 2013 +0100
committer Ben Murdoch <benm@google.com> Thu Jul 18 11:57:30 2013 +0100
tree 1c690f8b0c998ba536a0c7aeff34764383c7dff6
parent 106cdaa9e420b49e5b1ef6941f08dd990128a374

Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c

chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 1f72cee..169d04a 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -331,6 +331,10 @@
         'common/extensions/web_accessible_resources_handler.h',
         'common/external_ipc_fuzzer.cc',
         'common/external_ipc_fuzzer.h',
+        'common/favicon/favicon_types.cc',
+        'common/favicon/favicon_types.h',
+        'common/favicon/favicon_url_parser.cc',
+        'common/favicon/favicon_url_parser.h',
         'common/icon_with_badge_image_source.cc',
         'common/icon_with_badge_image_source.h',
         'common/importer/firefox_importer_utils.cc',