Revert of Add PrivacyMode support to the QuicStreamFactory.

net/quic/crypto/quic_crypto_client_config.cc

 // 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.
 
 #include "net/quic/crypto/quic_crypto_client_config.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "net/quic/crypto/cert_compressor.h"
 #include "net/quic/crypto/channel_id.h"
@@ skipping 680 matching lines @@
   DCHECK(server_state->IsEmpty());
   unsigned i = 0;
   for (; i < canoncial_suffixes_.size(); ++i) {
     if (EndsWith(server_key.host(), canoncial_suffixes_[i], false)) {
       break;
     }
   }
   if (i == canoncial_suffixes_.size())
     return;
 
-  QuicSessionKey suffix_server_key(canoncial_suffixes_[i], server_key.port(),
-                                   server_key.is_https(),
-                                   server_key.privacy_mode());
+  QuicSessionKey suffix_server_key(
+      canoncial_suffixes_[i], server_key.port(), server_key.is_https());
   if (!ContainsKey(canonical_server_map_, suffix_server_key)) {
     // This is the first host we've seen which matches the suffix, so make it
     // canonical.
     canonical_server_map_[suffix_server_key] = server_key;
     return;
   }
 
   const QuicSessionKey& canonical_server_key =
       canonical_server_map_[suffix_server_key];
   CachedState* canonical_state = cached_states_[canonical_server_key];
   if (!canonical_state->proof_valid()) {
     return;
   }
 
   // Update canonical version to point at the "most recent" entry.
   canonical_server_map_[suffix_server_key] = server_key;
 
   server_state->InitializeFrom(*canonical_state);
 }
 
 }  // namespace net