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

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: REBASE 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
« content/browser/download/download_create_info.cc ('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 4ad8a9648971f177ec058c534156cc0ef55cd041..8c6b25cf5328ccb8aa706e3edebd36525ff5ddb6 100644
--- a/net/http/http_stream_factory_impl_job_controller_unittest.cc
+++ b/net/http/http_stream_factory_impl_job_controller_unittest.cc
@@ -61,7 +61,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;
}
};
@@ -76,7 +76,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;
}
};
@@ -196,7 +196,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());
@@ -226,7 +226,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
@@ -264,7 +264,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());
@@ -298,7 +298,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());
@@ -342,7 +342,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());
@@ -393,7 +393,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());
@@ -438,7 +438,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());
@@ -485,7 +485,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());
@@ -534,7 +534,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());
@@ -559,7 +559,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());
@@ -604,7 +604,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());
@@ -666,7 +666,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());
@@ -725,7 +725,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());
@@ -757,7 +757,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());
@@ -784,7 +784,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());
@@ -821,7 +821,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());
@@ -882,7 +882,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());
« content/browser/download/download_create_info.cc ('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