Merge internal change: 63891842 - QuicServerId changes

net/quic/crypto/quic_server_info.cc

 // 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.
 
 #include "net/quic/crypto/quic_server_info.h"
 
 #include <limits>
 
 #include "base/pickle.h"
 
@@ skipping 11 matching lines @@
 
 QuicServerInfo::State::~State() {}
 
 void QuicServerInfo::State::Clear() {
   server_config.clear();
   source_address_token.clear();
   server_config_sig.clear();
   certs.clear();
 }
 
-QuicServerInfo::QuicServerInfo(const QuicSessionKey& server_key)
-    : server_key_(server_key) {
+QuicServerInfo::QuicServerInfo(const QuicServerId& server_id)
+    : server_id_(server_id) {
 }
 
 QuicServerInfo::~QuicServerInfo() {
 }
 
 const QuicServerInfo::State& QuicServerInfo::state() const {
   return state_;
 }
 
 QuicServerInfo::State* QuicServerInfo::mutable_state() {
@@ skipping 88 matching lines @@
       return string();
     }
   }
 
   return string(reinterpret_cast<const char *>(p.data()), p.size());
 }
 
 QuicServerInfoFactory::~QuicServerInfoFactory() {}
 
 }  // namespace net