Remove HttpStreamBase.

Remove HttpStreamBase.

HttpStreamBase was introduced to integrate the connection setup logic between
HTTP and WebSocket[1] by abstracting methods from HttpStream, but it is not
needed now. In addition to that, there is a downcast from HttpStreamBase to
HttpStream and that leads to a crash.

This CL moves all methods in HttpStreamBase to HttpStream and removes
HttpStreamBase.
This CL also replaces NULL with nullptr in some files.

1: https://chromium.googlesource.com/chromium/src/+/92b9a3e000136518c489975bebea57bc0f66333f
BUG=399535
Committed: https://crrev.com/a7e05bb2fd1c4065c4c95251bf62e0440a18cb7f
Cr-Commit-Position: refs/heads/master@{#302967}

[yhirano, 2014-11-04 05:41:05]

yhirano@chromium.org changed reviewers:
+ ricea@chromium.org, tyoshino@chromium.org

[tyoshino (SeeGerritForStatus), 2014-11-04 06:17:48]

CL desc

was introduced integrate
->
was introduced to integrate

[yhirano1, 2014-11-04 06:20:38]

On 2014/11/04 06:17:48, tyoshino wrote:
> CL desc
> 
> was introduced integrate
> ->
> was introduced to integrate

Thanks, fixed.

[tyoshino (SeeGerritForStatus), 2014-11-04 17:03:58]

lgtm

https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
File net/websockets/websocket_basic_handshake_stream.cc (right):

https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
net/websockets/websocket_basic_handshake_stream.cc:539: return nullptr;
use NULL for consistency with the other places where NULL is used?

[yhirano, 2014-11-05 02:19:50]

https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
File net/websockets/websocket_basic_handshake_stream.cc (right):

https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
net/websockets/websocket_basic_handshake_stream.cc:539: return nullptr;
On 2014/11/04 17:03:58, tyoshino wrote:
> use NULL for consistency with the other places where NULL is used?

Then I would rather use nullptr than NULL.
Replaced NULL in this file to nullptr.

[tyoshino-do-not-use, 2014-11-05 02:51:43]

tyoshino@google.com changed reviewers:
+ tyoshino@google.com

[tyoshino-do-not-use, 2014-11-05 02:51:44]

lgtm

https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...
File net/http/http_network_transaction_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...
net/http/http_network_transaction_unittest.cc:12279: HttpStream*
RenewStreamForAuth() override { return nullptr; }
do the same for this file.

NULL -> nullptr

https://codereview.chromium.org/699123002/diff/60001/net/http/http_stream_fac...
File net/http/http_stream_factory_impl_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/http/http_stream_fac...
net/http/http_stream_factory_impl_unittest.cc:97: HttpStream*
RenewStreamForAuth() override { return nullptr; }
NULL -> nullptr in this file

https://codereview.chromium.org/699123002/diff/60001/net/url_request/url_requ...
File net/url_request/url_request_http_job_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/url_request/url_requ...
net/url_request/url_request_http_job_unittest.cc:311: HttpStream*
RenewStreamForAuth() override { return nullptr; }
NULL -> nullptr in this file

[yhirano, 2014-11-05 03:55:37]

https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...
File net/http/http_network_transaction_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...
net/http/http_network_transaction_unittest.cc:12279: HttpStream*
RenewStreamForAuth() override { return nullptr; }
On 2014/11/05 02:51:44, tyoshino (google.com) wrote:
> do the same for this file.
> 
> NULL -> nullptr

Because this file is too big and contains too many NULLs, I gave up.

https://codereview.chromium.org/699123002/diff/60001/net/http/http_stream_fac...
File net/http/http_stream_factory_impl_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/http/http_stream_fac...
net/http/http_stream_factory_impl_unittest.cc:97: HttpStream*
RenewStreamForAuth() override { return nullptr; }
On 2014/11/05 02:51:44, tyoshino (google.com) wrote:
> NULL -> nullptr in this file

Done.

https://codereview.chromium.org/699123002/diff/60001/net/url_request/url_requ...
File net/url_request/url_request_http_job_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/60001/net/url_request/url_requ...
net/url_request/url_request_http_job_unittest.cc:311: HttpStream*
RenewStreamForAuth() override { return nullptr; }
On 2014/11/05 02:51:44, tyoshino (google.com) wrote:
> NULL -> nullptr in this file

Done.

[tyoshino (SeeGerritForStatus), 2014-11-05 05:44:51]

lgtm

[Adam Rice, 2014-11-05 12:59:45]

lgtm

[yhirano, 2014-11-05 13:01:02]

yhirano@chromium.org changed reviewers:
+ rsleevi@chromium.org

[yhirano, 2014-11-05 13:01:03]

+rsleevi for OWNER review.

[Ryan Sleevi, 2014-11-05 23:16:21]

rsleevi@chromium.org changed reviewers:
+ rch@chromium.org

[Ryan Sleevi, 2014-11-05 23:16:22]

I took a quick scan, but I'm actually going to punt this to rch@. He's versed in
this code.

[Ryan Sleevi, 2014-11-05 23:16:34]

rsleevi@chromium.org changed reviewers:
- rsleevi@chromium.org

[Ryan Hamilton, 2014-11-06 00:35:03]

LGTM, modulo one nit and one question.  (Assuming that the answer is yes :>)

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
File net/http/http_network_transaction.cc (left):

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
net/http/http_network_transaction.cc:424: // TODO(bashi): This cast is
temporary. Remove later.
Yay! :>

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
File net/http/http_network_transaction_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
net/http/http_network_transaction_unittest.cc:12280: 
nit: nullptr?

https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h
File net/http/http_stream.h (right):

https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h#n...
net/http/http_stream.h:156: virtual void SetPriority(RequestPriority priority) =
0;
Can you confirm that all of this is simply copied from HttpStreamBase?

[yhirano, 2014-11-06 01:13:54]

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
File net/http/http_network_transaction_unittest.cc (right):

https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
net/http/http_network_transaction_unittest.cc:12280: 
On 2014/11/06 00:35:03, Ryan Hamilton wrote:
> nit: nullptr?

I did so once, but tyoshino@ recommended to keep consistency in the file. I
changed NULL => nullptr in other files, but this file is too big and contains
many NULLs, so I gave up.

https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...

[Ryan Hamilton, 2014-11-06 01:30:36]

On 2014/11/06 01:13:54, yhirano wrote:
>
https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
> File net/http/http_network_transaction_unittest.cc (right):
> 
>
https://codereview.chromium.org/699123002/diff/80001/net/http/http_network_tr...
> net/http/http_network_transaction_unittest.cc:12280: 
> On 2014/11/06 00:35:03, Ryan Hamilton wrote:
> > nit: nullptr?
> 
> I did so once, but tyoshino@ recommended to keep consistency in the file. I
> changed NULL => nullptr in other files, but this file is too big and contains
> many NULLs, so I gave up.
> 
>
https://codereview.chromium.org/699123002/diff/40001/net/websockets/websocket...
>
https://codereview.chromium.org/699123002/diff/60001/net/http/http_network_tr...

SGTM

[yhirano, 2014-11-06 02:24:04]

https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h
File net/http/http_stream.h (right):

https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h#n...
net/http/http_stream.h:156: virtual void SetPriority(RequestPriority priority) =
0;
On 2014/11/06 00:35:03, Ryan Hamilton wrote:
> Can you confirm that all of this is simply copied from HttpStreamBase?

Yeah, I've rechecked it.
The only difference is replacing HttpStreamBase with HttpStream in comments.

[Ryan Hamilton, 2014-11-06 03:14:44]

On 2014/11/06 02:24:04, yhirano wrote:
> https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h
> File net/http/http_stream.h (right):
> 
>
https://codereview.chromium.org/699123002/diff/80001/net/http/http_stream.h#n...
> net/http/http_stream.h:156: virtual void SetPriority(RequestPriority priority)
=
> 0;
> On 2014/11/06 00:35:03, Ryan Hamilton wrote:
> > Can you confirm that all of this is simply copied from HttpStreamBase?
> 
> Yeah, I've rechecked it.
> The only difference is replacing HttpStreamBase with HttpStream in comments.

LGTM

[yhirano, 2014-11-06 03:32:18]

The CQ bit was checked by yhirano@chromium.org

[commit-bot: I haz the power, 2014-11-06 03:33:15]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/699123002/100001

[commit-bot: I haz the power, 2014-11-06 05:40:48]

Committed patchset #6 (id:100001)

[commit-bot: I haz the power, 2014-11-06 05:41:25]

Patchset 6 (id:??) landed as
https://crrev.com/a7e05bb2fd1c4065c4c95251bf62e0440a18cb7f
Cr-Commit-Position: refs/heads/master@{#302967}