Revert 110965 - Allow chrome to handle 407 auth challenges to CONNECT requests

Revert 110965 - Allow chrome to handle 407 auth challenges to CONNECT requests
through HTTPS Proxies. This also changes the mechanism used 
to restart HttpProxyClientSocket requests with auth. Previously
the transport socket would be Disconnected, and then re-Connected
(which was not implemented for SSLClientSockets). However, the 
approach was problematic in the face of, for example, ipv6. The
new approach is to close the HttpProxyClientSocket, and request
a new socket from the pool.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=114447

[Ryan Hamilton, 2011-12-13 18:29:17]

Need to revert this CL from trunk too.  Tried drover --revert, but that hit some
merge conflicts that I needed to deal with by hand.

[cbentzel, 2011-12-13 19:24:15]

On 2011/12/13 18:29:17, Ryan Hamilton wrote:
> Need to revert this CL from trunk too.  Tried drover --revert, but that hit
some
> merge conflicts that I needed to deal with by hand.

What were the merge conflicts? What portions should I look at closely?

[Ryan Hamilton, 2011-12-13 20:16:21]

On Tue, Dec 13, 2011 at 11:24 AM, <cbentzel@chromium.org> wrote:

> On 2011/12/13 18:29:17, Ryan Hamilton wrote:
>
>> Need to revert this CL from trunk too.  Tried drover --revert, but that
>> hit
>>
> some
>
>> merge conflicts that I needed to deal with by hand.
>>
>
> What were the merge conflicts? What portions should I look at closely?
>
>
http://codereview.chromium.**org/8912010/<http://codereview.chromium.org/8912...
>

The only "real" conflict was in HttpProxyClientSocket::DoTCPRestart() which
was calling Connect with io_callback.  However, the API has been changed
from OldCompletionCallback to CompletionCallback.  Otherwise, there were
conflicts that were mostly trivial to resolve in:

Conflict discovered in 'net/spdy/spdy_proxy_client_socket.h'.
Conflict discovered in 'net/spdy/spdy_proxy_client_socket_unittest.cc'.
Conflict discovered in 'net/http/http_proxy_utils.cc'.
Conflict discovered in 'net/http/http_network_transaction_unittest.cc'.
Conflict discovered in 'net/http/http_proxy_utils.h'.

It wasn't exactly obvious to my why svn wasn't able to merge these
correctly since all I needed to do was delete big chunks of code to resolve.

[cbentzel, 2011-12-13 21:11:53]

LGTM

On Tue, Dec 13, 2011 at 3:16 PM, Ryan Hamilton <rch@chromium.org> wrote:

>
>
> On Tue, Dec 13, 2011 at 11:24 AM, <cbentzel@chromium.org> wrote:
>
>> On 2011/12/13 18:29:17, Ryan Hamilton wrote:
>>
>>> Need to revert this CL from trunk too.  Tried drover --revert, but that
>>> hit
>>>
>> some
>>
>>> merge conflicts that I needed to deal with by hand.
>>>
>>
>> What were the merge conflicts? What portions should I look at closely?
>>
>>
http://codereview.chromium.**org/8912010/<http://codereview.chromium.org/8912...
>>
>
> The only "real" conflict was in HttpProxyClientSocket::DoTCPRestart()
> which was calling Connect with io_callback.  However, the API has been
> changed from OldCompletionCallback to CompletionCallback.  Otherwise, there
> were conflicts that were mostly trivial to resolve in:
>
> Conflict discovered in 'net/spdy/spdy_proxy_client_socket.h'.
> Conflict discovered in 'net/spdy/spdy_proxy_client_socket_unittest.cc'.
> Conflict discovered in 'net/http/http_proxy_utils.cc'.
> Conflict discovered in 'net/http/http_network_transaction_unittest.cc'.
> Conflict discovered in 'net/http/http_proxy_utils.h'.
>
> It wasn't exactly obvious to my why svn wasn't able to merge these
> correctly since all I needed to do was delete big chunks of code to resolve.
>

[commit-bot: I haz the power, 2011-12-13 21:25:10]

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

[commit-bot: I haz the power, 2011-12-13 22:24:22]

Try job failure for 8912010-1 (retry) on mac_rel for step "compile" (clobber
build).
It's a second try, previously, step "compile" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2011-12-14 16:24:32]

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

[commit-bot: I haz the power, 2011-12-14 17:33:21]

Change committed as 114447