Remove the "alternate_url" outparam from

net/http/http_stream_factory_impl_job.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_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
 #define NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 37 matching lines @@
   // notified upon completion if the Job has not been Orphan()'d.
   void Start(Request* request);
 
   // Preconnect will attempt to request |num_streams| sockets from the
   // appropriate ClientSocketPool.
   int Preconnect(int num_streams);
 
   int RestartTunnelWithProxyAuth(const AuthCredentials& credentials);
   LoadState GetLoadState() const;
 
-  // Marks this Job as the "alternate" job, from Alternate-Protocol. Tracks the
-  // original url so we can mark the Alternate-Protocol as broken if
-  // we fail to connect.  |alternate| specifies the alternate protocol to use
-  // and alternate port to connect to.
-  void MarkAsAlternate(const GURL& original_url,
-                       AlternativeService alternative_service);
+  // Marks this Job as the "alternate" job, from Alternate-Protocol or Alt-Svc
+  // using the specified alternate service.
+  void MarkAsAlternate(AlternativeService alternative_service);
 
   // Tells |this| to wait for |job| to resume it.
   void WaitFor(Job* job);
 
   // Tells |this| that |job| has determined it still needs to continue
   // connecting, so allow |this| to continue. If this is not called, then
   // |request_| is expected to cancel |this| by deleting it.
   void Resume(Job* job);
 
   // Used to detach the Job from |request|.
@@ skipping 192 matching lines @@
   SSLInfo ssl_info_;
 
   // The server we are trying to reach, could be that of the origin or of the
   // alternative service.
   HostPortPair server_;
 
   // The origin url we're trying to reach. This url may be different from the
   // original request when host mapping rules are set-up.
   GURL origin_url_;
 
-  // The original URL if the Job is for an alternative service.
-  GURL original_url_;
-
   // AlternateProtocol for this job if this is an alternate job.
   AlternativeService alternative_service_;
 
+  // The URL to be used for proxy resolution and socket pools. If the alternate
+  // service is SPDY, the URL will containg the host:port from
+  // |alternate_service_| and "https://" scheme.

[Bence, 2015/04/03 19:35:52]

Please clarify that for a non-alternate Job, this is the same as origin_url_.

[Ryan Hamilton, 2015/04/03 20:33:21]

Done.

+  GURL alternative_service_url_;
+
   // AlternateProtocol for the other job if this is not an alternate job.
   AlternativeService other_job_alternative_service_;
 
   // This is the Job we're dependent on. It will notify us if/when it's OK to
   // proceed.
   Job* blocking_job_;
 
   // |waiting_job_| is a Job waiting to see if |this| can reuse a connection.
   // If |this| is unable to do so, we'll notify |waiting_job_| that it's ok to
   // proceed and then race the two Jobs.
@@ skipping 51 matching lines @@
   JobStatus other_job_status_;
 
   base::WeakPtrFactory<Job> ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_STREAM_FACTORY_IMPL_JOB_H_