commit 03b57e008b61dfcb1fbad3aea950ae0e001748b0
author Torne (Richard Coles) <torne@google.com> Thu Aug 28 12:05:23 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Thu Aug 28 12:05:23 2014 +0100
tree 9a740c1a5fbe659ec83484b67cbc679332f5a408
parent ca7d0c81aa30d24514c34c963f43cd24da34a2bf

Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30

net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp
index c7c2c94..6fa0f62 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1047,7 +1047,6 @@
           'includes': [ '../build/grit_action.gypi' ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
     },
     {
       'target_name': 'http_server',
@@ -1485,6 +1484,8 @@
             'tools/quic/quic_in_memory_cache.h',
             'tools/quic/quic_packet_writer_wrapper.cc',
             'tools/quic/quic_packet_writer_wrapper.h',
+            'tools/quic/quic_per_connection_packet_writer.cc',
+            'tools/quic/quic_per_connection_packet_writer.h',
             'tools/quic/quic_server.cc',
             'tools/quic/quic_server.h',
             'tools/quic/quic_server_session.cc',