[Net] Propagate priority changes from URLRequest to HttpTransaction

net/http/http_network_transaction.cc

 // 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.
 
 #include "net/http/http_network_transaction.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 367 matching lines @@
 }
 
 UploadProgress HttpNetworkTransaction::GetUploadProgress() const {
   if (!stream_.get())
     return UploadProgress();
 
   // TODO(bashi): This cast is temporary. Remove later.
   return static_cast<HttpStream*>(stream_.get())->GetUploadProgress();
 }
 
+bool HttpNetworkTransaction::GetLoadTimingInfo(

[mmenke, 2013/03/12 18:40:22]

Thanks for fixing my misplacement of this function!

+    LoadTimingInfo* load_timing_info) const {
+  if (!stream_ || !stream_->GetLoadTimingInfo(load_timing_info))
+    return false;
+
+  load_timing_info->proxy_resolve_start =
+      proxy_info_.proxy_resolve_start_time();
+  load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time();
+  load_timing_info->send_start = send_start_time_;
+  load_timing_info->send_end = send_end_time_;
+  load_timing_info->receive_headers_end = receive_headers_end_;
+  return true;
+}
+
+void HttpNetworkTransaction::SetPriority(RequestPriority priority) {
+  net_log_.AddEvent(NetLog::TYPE_HTTP_TRANSACTION_SET_PRIORITY,
+                    NetLog::IntegerCallback("priority", priority));

[mmenke, 2013/03/12 18:40:22]

I don't think this is an event worth logging.

HttpNetworkTransactions, HttpCache::Transactions, and URLRequests all share the
same BoundNetLog object.  The structure of the log itself makes it clear when
there's a transaction going on and when there isn't.

So we'd basically always see 3 of these events in a row, except when the
priority is set very early on in the process.

[akalin, 2013/03/12 22:08:28]

Okay. I think we should still keep the new one URLRequest, since having the
priority updated is a distinct event overall. Ideally, the only other things
that would log the new priority would be the actual priority queues themselves
(or the owner of the queues), but I haven't plumbed it through yet.  How about I
keep the one in HttpNetworkTransaction (the lowest-layer one) and change the
TODO to remove the log once it's plumbed through?

Also, I think having the priority set early on is the common case.

[mmenke, 2013/03/12 22:58:26]

I agree that we should keep the one in URLRequest.  I don't see the point of
having a temporary one here, unless we have a temporary unit test that checks it
or something.

+  // TODO(akalin): Plumb this through to |stream_request_| and
+  // |stream_|.
+}
+
 void HttpNetworkTransaction::OnStreamReady(const SSLConfig& used_ssl_config,
                                            const ProxyInfo& used_proxy_info,
                                            HttpStreamBase* stream) {
   DCHECK_EQ(STATE_CREATE_STREAM_COMPLETE, next_state_);
   DCHECK(stream_request_.get());
 
   stream_.reset(stream);
   server_ssl_config_ = used_ssl_config;
   proxy_info_ = used_proxy_info;
   response_.was_npn_negotiated = stream_request_->was_npn_negotiated();
@@ skipping 77 matching lines @@
 
   headers_valid_ = true;
   response_ = response_info;
   server_ssl_config_ = used_ssl_config;
   proxy_info_ = used_proxy_info;
   stream_.reset(stream);
   stream_request_.reset();  // we're done with the stream request
   OnIOComplete(ERR_HTTPS_PROXY_TUNNEL_RESPONSE);
 }
 
-bool HttpNetworkTransaction::GetLoadTimingInfo(
-    LoadTimingInfo* load_timing_info) const {
-  if (!stream_ || !stream_->GetLoadTimingInfo(load_timing_info))
-    return false;
-
-  load_timing_info->proxy_resolve_start =
-      proxy_info_.proxy_resolve_start_time();
-  load_timing_info->proxy_resolve_end = proxy_info_.proxy_resolve_end_time();
-  load_timing_info->send_start = send_start_time_;
-  load_timing_info->send_end = send_end_time_;
-  load_timing_info->receive_headers_end = receive_headers_end_;
-  return true;
-}
-
 bool HttpNetworkTransaction::is_https_request() const {
   return request_->url.SchemeIs("https");
 }
 
 void HttpNetworkTransaction::DoCallback(int rv) {
   DCHECK_NE(rv, ERR_IO_PENDING);
   DCHECK(!callback_.is_null());
 
   // Since Run may result in Read being called, clear user_callback_ up front.
   CompletionCallback c = callback_;
@@ skipping 945 matching lines @@
       description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
                                        state);
       break;
   }
   return description;
 }
 
 #undef STATE_CASE
 
 }  // namespace net