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

Unified Diff: net/http/http_network_layer.cc

Issue 1342613002: Revert of Remove reference counting from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « net/http/http_network_layer.h ('k') | net/http/http_network_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_layer.cc
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 169a1cc1be5c161ca6f72ccc2d42e7bbcbfe36c7..e0b3199bb897dcc9839f240097834e73d3e37ec6 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -22,11 +22,11 @@
HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session)
: session_(session),
suspended_(false) {
- DCHECK(session_);
+ DCHECK(session_.get());
#if defined(OS_WIN)
- base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
- if (power_monitor)
- power_monitor->AddObserver(this);
+ base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
+ if (power_monitor)
+ power_monitor->AddObserver(this);
#endif
}
@@ -36,6 +36,14 @@
if (power_monitor)
power_monitor->RemoveObserver(this);
#endif
+}
+
+// static
+HttpTransactionFactory* HttpNetworkLayer::CreateFactory(
+ HttpNetworkSession* session) {
+ DCHECK(session);
+
+ return new HttpNetworkLayer(session);
}
int HttpNetworkLayer::CreateTransaction(RequestPriority priority,
@@ -51,13 +59,13 @@
return NULL;
}
-HttpNetworkSession* HttpNetworkLayer::GetSession() {
- return session_;
-}
+HttpNetworkSession* HttpNetworkLayer::GetSession() { return session_.get(); }
void HttpNetworkLayer::OnSuspend() {
suspended_ = true;
- session_->CloseIdleConnections();
+
+ if (session_.get())
+ session_->CloseIdleConnections();
}
void HttpNetworkLayer::OnResume() {
« no previous file with comments | « net/http/http_network_layer.h ('k') | net/http/http_network_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698