Merge internal change: 63891842 - QuicServerId changes

net/net.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 922 matching lines @@
         'quic/quic_protocol.cc',
         'quic/quic_protocol.h',
         'quic/quic_received_packet_manager.cc',
         'quic/quic_received_packet_manager.h',
         'quic/quic_reliable_client_stream.cc',
         'quic/quic_reliable_client_stream.h',
         'quic/quic_sent_entropy_manager.cc',
         'quic/quic_sent_entropy_manager.h',
         'quic/quic_sent_packet_manager.cc',
         'quic/quic_sent_packet_manager.h',
+        'quic/quic_server_id.cc',
+        'quic/quic_server_id.h',
         'quic/quic_session.cc',
         'quic/quic_session.h',
-        'quic/quic_session_key.cc',
-        'quic/quic_session_key.h',
         'quic/quic_socket_address_coder.cc',
         'quic/quic_socket_address_coder.h',
         'quic/quic_stream_factory.cc',
         'quic/quic_stream_factory.h',
         'quic/quic_stream_sequencer.cc',
         'quic/quic_stream_sequencer.h',
         'quic/quic_time.cc',
         'quic/quic_time.h',
         'quic/quic_unacked_packet_map.cc',
         'quic/quic_unacked_packet_map.h',
@@ skipping 1021 matching lines @@
         'quic/quic_http_stream_test.cc',
         'quic/quic_http_utils_test.cc',
         'quic/quic_network_transaction_unittest.cc',
         'quic/quic_packet_creator_test.cc',
         'quic/quic_packet_generator_test.cc',
         'quic/quic_protocol_test.cc',
         'quic/quic_received_packet_manager_test.cc',
         'quic/quic_reliable_client_stream_test.cc',
         'quic/quic_sent_entropy_manager_test.cc',
         'quic/quic_sent_packet_manager_test.cc',
-        'quic/quic_session_key_test.cc',
+        'quic/quic_server_id_test.cc',
         'quic/quic_session_test.cc',
         'quic/quic_socket_address_coder_test.cc',
         'quic/quic_stream_factory_test.cc',
         'quic/quic_stream_sequencer_test.cc',
         'quic/quic_time_test.cc',
         'quic/quic_utils_chromium_test.cc',
         'quic/quic_utils_test.cc',
         'quic/quic_write_blocked_list_test.cc',
         'quic/reliable_quic_stream_test.cc',
         'server/http_server_response_info_unittest.cc',
@@ skipping 1374 matching lines @@
             'java_in_dir': 'cronet/android/sample/javatests',
             'resource_dir': 'cronet/android/sample/res',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ],
 }