Add PrivacyMode support to the QuicStreamFactory.

Add PrivacyMode support to the QuicStreamFactory.

BUG=356338
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259303

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259537

[ramant (doing other things), 2014-03-03 18:33:59]

lgtm

[Ryan Hamilton, 2014-03-20 18:17:26]

raman: can you take another look?  Now that the crypto code and server info code
has been moved all around, I had to rework this CL.  I think it's a smaller CL
and it is correct, but I'd really value your feedback.

[ramant (doing other things), 2014-03-20 19:45:54]

IMHO, still LGTM.

[Ryan Hamilton, 2014-03-25 16:18:47]

The CQ bit was checked by rch@chromium.org

[commit-bot: I haz the power, 2014-03-25 16:19:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rch@chromium.org/185773006/210001

[commit-bot: I haz the power, 2014-03-25 19:51:47]

Change committed as 259303

[erikchen, 2014-03-25 20:36:42]

A revert of this CL has been created in
https://codereview.chromium.org/211373004/ by erikchen@chromium.org.

The reason for reverting is: Reverted by request from kareng. It breaks the
continuous official tests. 

../../net/tools/quic/quic_client_bin.cc: In function ‘int main(int, char**)’:
../../net/tools/quic/quic_client_bin.cc:76:67: error: no matching function for
call to ‘net::QuicSessionKey::QuicSessionKey(std::string&, int32&, bool&)’
../../net/tools/quic/quic_client_bin.cc:76:67: note: candidates are:
../../net/quic/quic_session_key.h:23:3: note:
net::QuicSessionKey::QuicSessionKey(const string&, uint16, bool,
net::PrivacyMode)
../../net/quic/quic_session_key.h:23:3: note:   candidate expects 4 arguments, 3
provided
../../net/quic/quic_session_key.h:20:3: note:
net::QuicSessionKey::QuicSessionKey(const net::HostPortPair&, bool,
net::PrivacyMode)
../../net/quic/quic_session_key.h:20:3: note:   no known conversion for argument
1 from ‘std::string {aka std::basic_string<char>}’ to ‘const net::HostPortPair&’
../../net/quic/quic_session_key.h:19:3: note:
net::QuicSessionKey::QuicSessionKey()
../../net/quic/quic_session_key.h:19:3: note:   candidate expects 0 arguments, 3
provided
../../net/quic/quic_session_key.h:17:26: note:
net::QuicSessionKey::QuicSessionKey(const net::QuicSessionKey&)
../../net/quic/quic_session_key.h:17:26: note:   candidate expects 1 argument, 3
provided.

[Ryan Hamilton, 2014-03-25 20:58:03]

The CQ bit was checked by rch@chromium.org

[commit-bot: I haz the power, 2014-03-25 20:58:34]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rch@chromium.org/185773006/340003

[commit-bot: I haz the power, 2014-03-26 00:49:00]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-26 00:49:00]

Retried try job too often on win_rel for step(s) base_unittests, browser_tests,
interactive_ui_tests, net_unittests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Ryan Hamilton, 2014-03-26 03:36:36]

The CQ bit was checked by rch@chromium.org

[commit-bot: I haz the power, 2014-03-26 03:36:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rch@chromium.org/185773006/340003

[commit-bot: I haz the power, 2014-03-26 05:20:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-26 05:20:30]

Failed to apply patch for net/quic/quic_stream_factory.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file net/quic/quic_stream_factory.cc
  Hunk #5 FAILED at 286.
  1 out of 11 hunks FAILED -- saving rejects to file
net/quic/quic_stream_factory.cc.rej

Patch:       net/quic/quic_stream_factory.cc
Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index
539794df7b26ec8df124288cb8c1f58d60fd1ad0..a4e65c5b7316ecd302c372b4377ad341191ea80e
100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -88,6 +88,7 @@ class QuicStreamFactory::Job {
       HostResolver* host_resolver,
       const HostPortPair& host_port_pair,
       bool is_https,
+      PrivacyMode privacy_mode,
       base::StringPiece method,
       QuicServerInfo* server_info,
       const BoundNetLog& net_log);
@@ -128,7 +129,6 @@ class QuicStreamFactory::Job {
 
   QuicStreamFactory* factory_;
   SingleRequestHostResolver host_resolver_;
-  bool is_https_;
   QuicSessionKey session_key_;
   bool is_post_;
   scoped_ptr<QuicServerInfo> server_info_;
@@ -145,13 +145,13 @@ QuicStreamFactory::Job::Job(QuicStreamFactory* factory,
                             HostResolver* host_resolver,
                             const HostPortPair& host_port_pair,
                             bool is_https,
+                            PrivacyMode privacy_mode,
                             base::StringPiece method,
                             QuicServerInfo* server_info,
                             const BoundNetLog& net_log)
     : factory_(factory),
       host_resolver_(host_resolver),
-      is_https_(is_https),
-      session_key_(host_port_pair, is_https),
+      session_key_(host_port_pair, is_https, privacy_mode),
       is_post_(method == "POST"),
       server_info_(server_info),
       net_log_(net_log),
@@ -273,9 +273,8 @@ int QuicStreamFactory::Job::DoLoadServerInfoComplete(int rv)
{
 int QuicStreamFactory::Job::DoConnect() {
   io_state_ = STATE_CONNECT_COMPLETE;
 
-  int rv = factory_->CreateSession(session_key_.host_port_pair(), is_https_,
-                                   server_info_.Pass(), address_list_,
-                                   net_log_, &session_);
+  int rv = factory_->CreateSession(session_key_, server_info_.Pass(),
+                                   address_list_, net_log_, &session_);
   if (rv != OK) {
     DCHECK(rv != ERR_IO_PENDING);
     DCHECK(!session_);
@@ -287,7 +286,7 @@ int QuicStreamFactory::Job::DoConnect() {
     return ERR_QUIC_PROTOCOL_ERROR;
   }
   rv = session_->CryptoConnect(
-      factory_->require_confirmation() || is_https_,
+      factory_->require_confirmation() || session_key_.is_https(),
       base::Bind(&QuicStreamFactory::Job::OnIOComplete,
                  base::Unretained(this)));
   return rv;
@@ -322,13 +321,15 @@ QuicStreamRequest::~QuicStreamRequest() {
 
 int QuicStreamRequest::Request(const HostPortPair& host_port_pair,
                                bool is_https,
+                               PrivacyMode privacy_mode,
                                base::StringPiece method,
                                const BoundNetLog& net_log,
                                const CompletionCallback& callback) {
   DCHECK(!stream_);
   DCHECK(callback_.is_null());
   DCHECK(factory_);
-  int rv = factory_->Create(host_port_pair, is_https, method, net_log, this);
+  int rv = factory_->Create(host_port_pair, is_https, privacy_mode, method,
+                            net_log, this);
   if (rv == ERR_IO_PENDING) {
     host_port_pair_ = host_port_pair;
     is_https_ = is_https;
@@ -404,10 +405,11 @@ QuicStreamFactory::~QuicStreamFactory() {
 
 int QuicStreamFactory::Create(const HostPortPair& host_port_pair,
                               bool is_https,
+                              PrivacyMode privacy_mode,
                               base::StringPiece method,
                               const BoundNetLog& net_log,
                               QuicStreamRequest* request) {
-  QuicSessionKey session_key(host_port_pair, is_https);
+  QuicSessionKey session_key(host_port_pair, is_https, privacy_mode);
   if (HasActiveSession(session_key)) {
     request->set_stream(CreateIfSessionExists(session_key, net_log));
     return OK;
@@ -429,8 +431,8 @@ int QuicStreamFactory::Create(const HostPortPair&
host_port_pair,
       quic_server_info = quic_server_info_factory_->GetForServer(session_key);
     }
   }
-  scoped_ptr<Job> job(new Job(this, host_resolver_, host_port_pair,
-                              is_https, method, quic_server_info, net_log));
+  scoped_ptr<Job> job(new Job(this, host_resolver_, host_port_pair, is_https,
+                              privacy_mode, method, quic_server_info,
net_log));
   int rv = job->Run(base::Bind(&QuicStreamFactory::OnJobComplete,
                                base::Unretained(this), job.get()));
 
@@ -653,14 +655,12 @@ bool QuicStreamFactory::HasActiveSession(
 }
 
 int QuicStreamFactory::CreateSession(
-    const HostPortPair& host_port_pair,
-    bool is_https,
+    const QuicSessionKey& session_key,
     scoped_ptr<QuicServerInfo> server_info,
     const AddressList& address_list,
     const BoundNetLog& net_log,
     QuicClientSession** session) {
   bool enable_port_selection = enable_port_selection_;
-  QuicSessionKey session_key(host_port_pair, is_https);
   if (enable_port_selection &&
       ContainsKey(gone_away_aliases_, session_key)) {
     // Disable port selection when the server is going away.
@@ -673,7 +673,7 @@ int QuicStreamFactory::CreateSession(
   QuicConnectionId connection_id = random_generator_->RandUint64();
   IPEndPoint addr = *address_list.begin();
   scoped_refptr<PortSuggester> port_suggester =
-      new PortSuggester(host_port_pair, port_seed_);
+      new PortSuggester(session_key.host_port_pair(), port_seed_);
   DatagramSocket::BindType bind_type = enable_port_selection ?
       DatagramSocket::RANDOM_BIND :  // Use our callback.
       DatagramSocket::DEFAULT_BIND;  // Use OS to randomize.
@@ -733,7 +733,8 @@ int QuicStreamFactory::CreateSession(
   QuicConfig config = config_;
   if (http_server_properties_) {
     const HttpServerProperties::NetworkStats* stats =
-        http_server_properties_->GetServerNetworkStats(host_port_pair);
+        http_server_properties_->GetServerNetworkStats(
+            session_key.host_port_pair());
     if (stats != NULL) {
       config.set_initial_round_trip_time_us(stats->rtt.InMicroseconds(),
                                             stats->rtt.InMicroseconds());

[Ryan Hamilton, 2014-03-26 06:45:45]

The CQ bit was checked by rch@chromium.org

[commit-bot: I haz the power, 2014-03-26 06:46:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/rch@chromium.org/185773006/700001

[commit-bot: I haz the power, 2014-03-26 09:51:30]

Change committed as 259537