Index: blimp/client/session/blimp_client_session.cc |
diff --git a/blimp/client/session/blimp_client_session.cc b/blimp/client/session/blimp_client_session.cc |
index ca75ba435715c43a267aa67cc6557ae9a56b2f0c..f4a0f4c3d9ebc4e67b311b95ef0ae8fdd08acee7 100644 |
--- a/blimp/client/session/blimp_client_session.cc |
+++ b/blimp/client/session/blimp_client_session.cc |
@@ -72,9 +72,8 @@ |
public ConnectionErrorObserver { |
public: |
// Can be created on any thread. |
- ClientNetworkComponents( |
- std::unique_ptr<NetworkEventObserver> observer, |
- std::unique_ptr<BlimpConnectionStatistics> blimp_connection_statistics); |
+ explicit ClientNetworkComponents( |
+ std::unique_ptr<NetworkEventObserver> observer); |
~ClientNetworkComponents() override; |
// Sets up network components. |
@@ -96,19 +95,14 @@ |
std::unique_ptr<BrowserConnectionHandler> connection_handler_; |
std::unique_ptr<ClientConnectionManager> connection_manager_; |
std::unique_ptr<NetworkEventObserver> network_observer_; |
- std::unique_ptr<BlimpConnectionStatistics> connection_statistics_; |
DISALLOW_COPY_AND_ASSIGN(ClientNetworkComponents); |
}; |
ClientNetworkComponents::ClientNetworkComponents( |
- std::unique_ptr<NetworkEventObserver> network_observer, |
- std::unique_ptr<BlimpConnectionStatistics> statistics) |
+ std::unique_ptr<NetworkEventObserver> network_observer) |
: connection_handler_(new BrowserConnectionHandler), |
- network_observer_(std::move(network_observer)), |
- connection_statistics_(std::move(statistics)) { |
- DCHECK(connection_statistics_); |
-} |
+ network_observer_(std::move(network_observer)) {} |
ClientNetworkComponents::~ClientNetworkComponents() {} |
@@ -127,13 +121,12 @@ |
case Assignment::SSL: |
DCHECK(assignment.cert); |
connection_manager_->AddTransport(base::WrapUnique(new SSLClientTransport( |
- assignment.engine_endpoint, std::move(assignment.cert), |
- connection_statistics_.get(), nullptr))); |
+ assignment.engine_endpoint, std::move(assignment.cert), nullptr))); |
transport_type = "SSL"; |
break; |
case Assignment::TCP: |
- connection_manager_->AddTransport(base::WrapUnique(new TCPClientTransport( |
- assignment.engine_endpoint, connection_statistics_.get(), nullptr))); |
+ connection_manager_->AddTransport(base::WrapUnique( |
+ new TCPClientTransport(assignment.engine_endpoint, nullptr))); |
transport_type = "TCP"; |
break; |
case Assignment::UNKNOWN: |
@@ -173,14 +166,13 @@ |
render_widget_feature_(new RenderWidgetFeature), |
settings_feature_(new SettingsFeature), |
weak_factory_(this) { |
+ net_components_.reset(new ClientNetworkComponents( |
+ base::WrapUnique(new CrossThreadNetworkEventObserver( |
+ weak_factory_.GetWeakPtr(), |
+ base::SequencedTaskRunnerHandle::Get())))); |
base::Thread::Options options; |
options.message_loop_type = base::MessageLoop::TYPE_IO; |
io_thread_.StartWithOptions(options); |
- blimp_connection_statistics_ = new BlimpConnectionStatistics(); |
- net_components_.reset(new ClientNetworkComponents( |
- base::WrapUnique(new CrossThreadNetworkEventObserver( |
- weak_factory_.GetWeakPtr(), base::SequencedTaskRunnerHandle::Get())), |
- base::WrapUnique(blimp_connection_statistics_))); |
assignment_source_.reset(new AssignmentSource( |
assigner_endpoint, io_thread_.task_runner(), io_thread_.task_runner())); |
@@ -286,10 +278,5 @@ |
return settings_feature_.get(); |
} |
-BlimpConnectionStatistics* BlimpClientSession::GetBlimpConnectionStatistics() |
- const { |
- return blimp_connection_statistics_; |
-} |
- |
} // namespace client |
} // namespace blimp |