Land recent SPDY changes (through 70021377)

net/net.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is shared between the regular GYP build, the NaCl GYP build, and
 # the GN build. For GN support, it must have no conditionals or anything like
 # that beyond the simple one-level-deep dictionary of values.
 {
   'variables': {
     # Subset of net source files that are compiled for NaCl (net_nacl target).
@@ skipping 1016 matching lines @@
       'spdy/spdy_headers_block_parser.h',
       'spdy/spdy_http_stream.cc',
       'spdy/spdy_http_stream.h',
       'spdy/spdy_http_utils.cc',
       'spdy/spdy_http_utils.h',
       'spdy/spdy_pinnable_buffer_piece.cc',
       'spdy/spdy_pinnable_buffer_piece.h',
       'spdy/spdy_prefixed_buffer_reader.cc',
       'spdy/spdy_prefixed_buffer_reader.h',
       'spdy/spdy_priority_forest.h',
+      'spdy/spdy_priority_tree.h',
       'spdy/spdy_protocol.cc',
       'spdy/spdy_protocol.h',
       'spdy/spdy_proxy_client_socket.cc',
       'spdy/spdy_proxy_client_socket.h',
       'spdy/spdy_read_queue.cc',
       'spdy/spdy_read_queue.h',
       'spdy/spdy_session.cc',
       'spdy/spdy_session.h',
       'spdy/spdy_session_key.cc',
       'spdy/spdy_session_key.h',
@@ skipping 533 matching lines @@
       'spdy/spdy_frame_reader_test.cc',
       'spdy/spdy_framer_test.cc',
       'spdy/spdy_header_block_unittest.cc',
       'spdy/spdy_headers_block_parser_test.cc',
       'spdy/spdy_http_stream_unittest.cc',
       'spdy/spdy_http_utils_unittest.cc',
       'spdy/spdy_network_transaction_unittest.cc',
       'spdy/spdy_pinnable_buffer_piece_test.cc',
       'spdy/spdy_prefixed_buffer_reader_test.cc',
       'spdy/spdy_priority_forest_test.cc',
+      'spdy/spdy_priority_tree_test.cc',
       'spdy/spdy_protocol_test.cc',
       'spdy/spdy_proxy_client_socket_unittest.cc',
       'spdy/spdy_read_queue_unittest.cc',
       'spdy/spdy_session_pool_unittest.cc',
       'spdy/spdy_session_test_util.cc',
       'spdy/spdy_session_test_util.h',
       'spdy/spdy_session_unittest.cc',
       'spdy/spdy_stream_test_util.cc',
       'spdy/spdy_stream_test_util.h',
       'spdy/spdy_stream_unittest.cc',
@@ skipping 108 matching lines @@
       'tools/quic/test_tools/quic_test_client.h',
       'tools/quic/test_tools/quic_test_utils.cc',
       'tools/quic/test_tools/quic_test_utils.h',
       'tools/quic/test_tools/server_thread.h',
       'tools/quic/test_tools/server_thread.cc',
       'tools/quic/test_tools/simple_client.h',
       'tools/quic/test_tools/simple_client.cc',
     ],
   }
 }