commit 558790d6acca3451cf3a6b497803a5f07d0bec58
author Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
committer Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
tree fcc36c3da74559ee6015cb5e9f596105cdc9f56e
parent 8643c35ec8e6546ae6e04c51e08c4d57d40e88da

Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1

chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 6ae85c4..fde3124 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -736,6 +736,8 @@
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
         'common/net/predictor_common.h',
+        'common/net/url_fixer_upper.cc',
+        'common/net/url_fixer_upper.h',
         'common/net/url_util.cc',
         'common/net/url_util.h',
         'common/net/x509_certificate_model.cc',