Revert r113405, since it appears to be causing a crash and a hang.

Revert r113405, since it appears to be causing a crash and a hang. Also reverted r118506 since it is no longer applicable.

BUG=109876, 110368, 62364, 92244
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=118788

[eroman, 2012-01-21 00:19:58]

After this passes try bots I'll probably just commit it TBR.

The revert was mostly mechanical. There were a couple conflicts from the
Callback switch over, and the rename of a spdy class. I also left in some of the
OVERRIDEs that the original added rather than take them out. Beyond that should
be a straight up reverse patch!

[commit-bot: I haz the power, 2012-01-21 03:15:33]

No LGTM from any valid reviewer yet. Even if a LGTM may have been
provided, it was from a non-committer or a provisional committer
and not a full committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[mmenke, 2012-01-23 20:07:53]

Sorry for the silly little nits.

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_handle.cc
File net/socket/client_socket_handle.cc (right):

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_handle...
net/socket/client_socket_handle.cc:1: // Copyright (c) 2010 The Chromium
Authors. All rights reserved.
I assume reverting the year is correct, when reverting?

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_pool_b...
File net/socket/client_socket_pool_base_unittest.cc (right):

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_pool_b...
net/socket/client_socket_pool_base_unittest.cc:1: // Copyright (c) 2011 The
Chromium Authors. All rights reserved.
nit:  2012, since this isn't a full revert

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h
File net/spdy/spdy_session.h (right):

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h#newcode18
net/spdy/spdy_session.h:18: #include "base/memory/weak_ptr.h"
nit:  Remove this, too?  Or update year, since it wouldn't be a full revert.

[eroman, 2012-01-23 22:04:09]

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_handle.cc
File net/socket/client_socket_handle.cc (right):

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_handle...
net/socket/client_socket_handle.cc:1: // Copyright (c) 2010 The Chromium
Authors. All rights reserved.
On 2012/01/23 20:07:56, Matt Menke wrote:
> I assume reverting the year is correct, when reverting?

Removed.

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_pool_b...
File net/socket/client_socket_pool_base_unittest.cc (right):

http://codereview.chromium.org/9226039/diff/1/net/socket/client_socket_pool_b...
net/socket/client_socket_pool_base_unittest.cc:1: // Copyright (c) 2011 The
Chromium Authors. All rights reserved.
On 2012/01/23 20:07:56, Matt Menke wrote:
> nit:  2012, since this isn't a full revert

Done.

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h
File net/spdy/spdy_session.h (right):

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h#newcode18
net/spdy/spdy_session.h:18: #include "base/memory/weak_ptr.h"
On 2012/01/23 20:07:56, Matt Menke wrote:
> nit:  Remove this, too?  Or update year, since it wouldn't be a full revert.

Are you referring to the copyright line? updated to 2012. weakptr.h is needed
since there are some weakptr factories.

[commit-bot: I haz the power, 2012-01-23 22:04:29]

No LGTM from any valid reviewer yet. Even if a LGTM may have been
provided, it was from a non-committer or a provisional committer
and not a full committer.
See http://www.chromium.org/getting-involved/become-a-committer
Note that this has nothing to do with OWNERS files.

[mmenke1, 2012-01-23 22:04:58]

Oops... sorry, LGTM

[commit-bot: I haz the power, 2012-01-23 22:05:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/9226039/12001

[commit-bot: I haz the power, 2012-01-23 22:05:17]

Can't apply patch for file net/http/http_network_transaction_unittest.cc.
While running patch -p1 --forward --force;
patching file net/http/http_network_transaction_unittest.cc
Hunk #1 FAILED at 9379.
1 out of 1 hunk FAILED -- saving rejects to file
net/http/http_network_transaction_unittest.cc.rej

[mmenke1, 2012-01-23 22:09:04]

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h
File net/spdy/spdy_session.h (right):

http://codereview.chromium.org/9226039/diff/1/net/spdy/spdy_session.h#newcode18
net/spdy/spdy_session.h:18: #include "base/memory/weak_ptr.h"
On 2012/01/23 22:04:15, eroman wrote:
> On 2012/01/23 20:07:56, Matt Menke wrote:
> > nit:  Remove this, too?  Or update year, since it wouldn't be a full revert.
> 
> Are you referring to the copyright line? updated to 2012. weakptr.h is needed
> since there are some weakptr factories.

Sorry, I just blindly compared the diffs.  What I meant was it wasn't here
before willchan's CL (Incorrectly, looks like), so this isn't a pure revert, and
thus the copyright should be updated, unless the line is removed (And you're
right, it shouldn't be).

[commit-bot: I haz the power, 2012-01-23 22:25:54]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/9226039/13018

[commit-bot: I haz the power, 2012-01-24 00:28:39]

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

[commit-bot: I haz the power, 2012-01-24 01:52:30]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/9226039/13018

[commit-bot: I haz the power, 2012-01-24 01:54:59]

Try job failure for 9226039-13018 on linux_rel for step "update".
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

Step "update" is always a major failure.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-01-24 02:01:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/eroman@chromium.org/9226039/13018

[eroman, 2012-01-24 02:08:01]

ok this is ridiculous. i'm just going to commit it manually, since these files
keep changing and tests keep flaking.

[mmenke, 2012-01-24 02:12:53]

SGTM

[mmenke, 2012-01-24 02:18:28]

On 2012/01/24 02:12:53, Matt Menke wrote:
> SGTM

Oh, and I cancelled the last CQ, out of paranoia.