Revert of Add PrivacyMode support to the QuicStreamFactory.

net/quic/quic_stream_factory.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_QUIC_QUIC_STREAM_FACTORY_H_
 #define NET_QUIC_QUIC_STREAM_FACTORY_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 36 matching lines @@
 // If the request is still pending when it is destroyed, it will
 // cancel the request with the factory.
 class NET_EXPORT_PRIVATE QuicStreamRequest {
  public:
   explicit QuicStreamRequest(QuicStreamFactory* factory);
   ~QuicStreamRequest();
 
   // For http, |is_https| is false and |cert_verifier| can be null.
   int Request(const HostPortPair& host_port_pair,
               bool is_https,
-              PrivacyMode privacy_mode,
               base::StringPiece method,
               const BoundNetLog& net_log,
               const CompletionCallback& callback);
 
   void OnRequestComplete(int rv);
 
   scoped_ptr<QuicHttpStream> ReleaseStream();
 
   void set_stream(scoped_ptr<QuicHttpStream> stream);
 
@@ skipping 34 matching lines @@
 
   // Creates a new QuicHttpStream to |host_port_pair| which will be
   // owned by |request|. |is_https| specifies if the protocol is https or not.
   // |cert_verifier| is used by ProofVerifier for verifying the certificate
   // chain and signature. For http, this can be null. If a matching session
   // already exists, this method will return OK.  If no matching session exists,
   // this will return ERR_IO_PENDING and will invoke OnRequestComplete
   // asynchronously.
   int Create(const HostPortPair& host_port_pair,
              bool is_https,
-             PrivacyMode privacy_mode,
              base::StringPiece method,
              const BoundNetLog& net_log,
              QuicStreamRequest* request);
 
   // Called by a session when it becomes idle.
   void OnIdleSession(QuicClientSession* session);
 
   // Called by a session when it is going away and no more streams should be
   // created on it.
   void OnSessionGoingAway(QuicClientSession* session);
@@ skipping 36 matching lines @@
     DCHECK(!quic_server_info_factory_);
     quic_server_info_factory_ = quic_server_info_factory;
   }
 
   bool enable_pacing() const { return enable_pacing_; }
 
  private:
   class Job;
   friend class test::QuicStreamFactoryPeer;
 
-  // The key used to find session by ip. Includes
+  // The key used to find session by hostname. Includes
   // the ip address, port, and scheme.
   struct NET_EXPORT_PRIVATE IpAliasKey {
     IpAliasKey();
     IpAliasKey(IPEndPoint ip_endpoint, bool is_https);
     ~IpAliasKey();
 
     IPEndPoint ip_endpoint;
     bool is_https;
 
     // Needed to be an element of std::set.
@@ skipping 15 matching lines @@
   // Returns a newly created QuicHttpStream owned by the caller, if a
   // matching session already exists.  Returns NULL otherwise.
   scoped_ptr<QuicHttpStream> CreateIfSessionExists(const QuicSessionKey& key,
                                                    const BoundNetLog& net_log);
 
   bool OnResolution(const QuicSessionKey& session_key,
                     const AddressList& address_list);
   void OnJobComplete(Job* job, int rv);
   bool HasActiveSession(const QuicSessionKey& session_key) const;
   bool HasActiveJob(const QuicSessionKey& session_key) const;
-  int CreateSession(const QuicSessionKey& session_key,
+  int CreateSession(const HostPortPair& host_port_pair,
+                    bool is_https,
                     scoped_ptr<QuicServerInfo> quic_server_info,
                     const AddressList& address_list,
                     const BoundNetLog& net_log,
                     QuicClientSession** session);
   void ActivateSession(const QuicSessionKey& key,
                        QuicClientSession* session);
 
   // Initializes the cached state associated with |session_key| in
   // |crypto_config_| with the information in |server_info|.
   void InitializeCachedState(const QuicSessionKey& session_key,
@@ skipping 69 matching lines @@
   uint64 port_seed_;
 
   base::WeakPtrFactory<QuicStreamFactory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicStreamFactory);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_STREAM_FACTORY_H_