| Index: net/http/http_stream_factory_impl_job_controller.cc
|
| diff --git a/net/http/http_stream_factory_impl_job_controller.cc b/net/http/http_stream_factory_impl_job_controller.cc
|
| index 7c420b5365933517cc8d724551649b3456272526..6972d27a57689f4002f4ca141a0327f959e314ee 100644
|
| --- a/net/http/http_stream_factory_impl_job_controller.cc
|
| +++ b/net/http/http_stream_factory_impl_job_controller.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| +#include "base/trace_event/memory_usage_estimator.h"
|
| #include "base/values.h"
|
| #include "net/base/host_mapping_rules.h"
|
| #include "net/base/proxy_delegate.h"
|
| @@ -679,12 +680,8 @@ bool HttpStreamFactoryImpl::JobController::HasPendingAltJob() const {
|
| }
|
|
|
| size_t HttpStreamFactoryImpl::JobController::EstimateMemoryUsage() const {
|
| - size_t estimated_size = 0;
|
| - if (main_job_)
|
| - estimated_size += main_job_->EstimateMemoryUsage();
|
| - if (alternative_job_)
|
| - estimated_size += alternative_job_->EstimateMemoryUsage();
|
| - return estimated_size;
|
| + return base::trace_event::EstimateMemoryUsage(main_job_) +
|
| + base::trace_event::EstimateMemoryUsage(alternative_job_);
|
| }
|
|
|
| WebSocketHandshakeStreamBase::CreateHelper* HttpStreamFactoryImpl::
|
|
|