Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_job_controller_unittest.cc

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/http/http_stream_factory_impl_job_controller.cc ('k') | net/http/http_stream_factory_impl_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job_controller_unittest.cc
diff --git a/net/http/http_stream_factory_impl_job_controller_unittest.cc b/net/http/http_stream_factory_impl_job_controller_unittest.cc
index aa51276eebb80e3b6a13f515ad3da80af9b8969d..2dd37fefc985f068fc768d90a1f0a280fb3a117f 100644
--- a/net/http/http_stream_factory_impl_job_controller_unittest.cc
+++ b/net/http/http_stream_factory_impl_job_controller_unittest.cc
@@ -62,7 +62,7 @@ class FailingHostResolver : public MockHostResolverBase {
AddressList* addresses,
const CompletionCallback& callback,
std::unique_ptr<Request>* out_req,
- const BoundNetLog& net_log) override {
+ const NetLogWithSource& net_log) override {
return ERR_NAME_NOT_RESOLVED;
}
};
@@ -77,7 +77,7 @@ class HangingResolver : public MockHostResolverBase {
AddressList* addresses,
const CompletionCallback& callback,
std::unique_ptr<Request>* out_req,
- const BoundNetLog& net_log) override {
+ const NetLogWithSource& net_log) override {
return ERR_IO_PENDING;
}
};
@@ -197,7 +197,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
@@ -227,7 +227,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
// There's no other alternative job. Thus when a stream is ready, it should
@@ -265,7 +265,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, CancelJobsBeforeBinding) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -299,7 +299,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, OnStreamFailedForBothJobs) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -343,7 +343,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -394,7 +394,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -439,7 +439,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -486,7 +486,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, GetLoadStateAfterMainJobFailed) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -535,7 +535,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, DoNotResumeMainJobBeforeWait) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -560,7 +560,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, InvalidPortForQuic) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_factory_.main_job()->is_waiting());
@@ -605,7 +605,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
// Both jobs should be created but stalled as proxy resolution not completed.
EXPECT_TRUE(job_controller_->main_job());
@@ -667,7 +667,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -726,7 +726,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, DelayedTCP) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -758,7 +758,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, HttpsURL) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_FALSE(job_controller_->main_job()->is_waiting());
@@ -785,7 +785,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, HttpURLWithNoProxy) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_FALSE(job_controller_->main_job()->is_waiting());
@@ -822,7 +822,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, DelayedTCPAlternativeProxy) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->main_job()->is_waiting());
@@ -883,7 +883,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest, FailAlternativeProxy) {
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job()->is_waiting());
EXPECT_TRUE(job_controller_->alternative_job());
@@ -920,7 +920,7 @@ TEST_F(HttpStreamFactoryImplJobControllerTest,
request_.reset(
job_controller_->Start(request_info, &request_delegate_, nullptr,
- BoundNetLog(), HttpStreamRequest::HTTP_STREAM,
+ NetLogWithSource(), HttpStreamRequest::HTTP_STREAM,
DEFAULT_PRIORITY, SSLConfig(), SSLConfig()));
EXPECT_TRUE(job_controller_->main_job());
EXPECT_TRUE(job_controller_->alternative_job());
« components/data_reduction_proxy/core/browser/data_reduction_proxy_config.h ('K') | « net/http/http_stream_factory_impl_job_controller.cc ('k') | net/http/http_stream_factory_impl_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698