Fix --host-rules command switch.

net/http/http_stream_factory_impl_job.cc

 // Copyright (c) 2011 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_stream_factory_impl_job.h"
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 424 matching lines @@
         break;
     }
   } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE);
   return rv;
 }
 
 int HttpStreamFactoryImpl::Job::StartInternal() {
   CHECK_EQ(STATE_NONE, next_state_);
   net_log_.BeginEvent(NetLog::TYPE_HTTP_STREAM_JOB,
                       make_scoped_refptr(new NetLogStringParameter(
                           "url", request_info_.url.GetOrigin().spec())));

[willchan no longer on Chromium, 2011/06/07 19:53:29]

I think that if the host mapping rules get applied, we should add a new NetLog
parameter saying what the modified url is. You'll need to make a new
EventParameters subclass:
http://codesearch.google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/net/base/net_....
It's pretty simple, look at
http://codesearch.google.com/codesearch/p?hl=en#OAMlx_jo-ck/src/net/base/net_...
for an example. Basically, you need a second string parameter.

[levin, 2011/06/08 00:37:25]

Am I suppose to call net_log_.AddEvent (and create a new event) within
DoResolveProxy? Do I do another Begin/EndEvent call? (that seems unlikely)

Should I remove this call to BeginEvent and move it to DoResolveProxy and add a
string to NetLogStringParameter?

I'm more than willing to do what you want, but I don't know enough about this
are to understand your instructions (even though you did point out some code).
My apologies.

[willchan no longer on Chromium, 2011/06/08 05:27:31]

Hah, no apologies needed. Obviously if you don't understand I didn't explain
well enough, you're not expected to know this code. So, no need to call
BeginEvent() again. This call here is great, except the 2nd parameter should
change. Currently, the second parameter is a NetLogStringParameter which is
logging a string value to the parameter named "url". You want to create a
subclass of NetLog::EventParameter which will log a value to "url" and also
"original_url".

And I think it's fine to move both the setting of |origin_| and |origin_url_| to
StartInternal().

   next_state_ = STATE_RESOLVE_PROXY;
   int rv = RunLoop(OK);
   DCHECK_EQ(ERR_IO_PENDING, rv);
   return rv;
 }
 
 int HttpStreamFactoryImpl::Job::DoResolveProxy() {
   DCHECK(!pac_request_);
 
   next_state_ = STATE_RESOLVE_PROXY_COMPLETE;
 
   origin_ = HostPortPair(request_info_.url.HostNoBrackets(),
                          request_info_.url.EffectiveIntPort());
 
+  origin_url_ = HttpStreamFactory::ApplyHostMappingRules(
+      request_info_.url, &origin_);
+
   if (request_info_.load_flags & LOAD_BYPASS_PROXY) {
     proxy_info_.UseDirect();
     return OK;
   }
 
   return session_->proxy_service()->ResolveProxy(
       request_info_.url, &proxy_info_, &io_callback_, &pac_request_,
       net_log_);
 }
 
@@ skipping 99 matching lines @@
   if (proxy_info_.is_https()) {
     InitSSLConfig(proxy_info_.proxy_server().host_port_pair(),
                   &ssl_config_for_proxy);
   }
   if (using_ssl_) {
     InitSSLConfig(origin_, &ssl_config_);
   }
 
   if (IsPreconnecting()) {
     return ClientSocketPoolManager::PreconnectSocketsForHttpRequest(
-        request_info_,
+        origin_url_,
+        request_info_.referrer,
+        request_info_.extra_headers,
+        request_info_.load_flags,
+        request_info_.priority,
         session_,
         proxy_info_,
         ShouldForceSpdySSL(),
         want_spdy_over_npn,
         ssl_config_,
         ssl_config_for_proxy,
         net_log_,
         num_streams_);
   } else {
     return ClientSocketPoolManager::InitSocketHandleForHttpRequest(
-        request_info_,
+        origin_url_,
+        request_info_.referrer,
+        request_info_.extra_headers,
+        request_info_.load_flags,
+        request_info_.priority,
         session_,
         proxy_info_,
         ShouldForceSpdySSL(),
         want_spdy_over_npn,
         ssl_config_,
         ssl_config_for_proxy,
         net_log_,
         connection_.get(),
         &io_callback_);
   }
@@ skipping 457 matching lines @@
 bool HttpStreamFactoryImpl::Job::IsPreconnecting() const {
   DCHECK_GE(num_streams_, 0);
   return num_streams_ > 0;
 }
 
 bool HttpStreamFactoryImpl::Job::IsOrphaned() const {
   return !IsPreconnecting() && !request_;
 }
 
 }  // namespace net