Index: net/http/http_network_layer.cc |
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc |
index e0b3199bb897dcc9839f240097834e73d3e37ec6..169a1cc1be5c161ca6f72ccc2d42e7bbcbfe36c7 100644 |
--- a/net/http/http_network_layer.cc |
+++ b/net/http/http_network_layer.cc |
@@ -22,11 +22,11 @@ namespace net { |
HttpNetworkLayer::HttpNetworkLayer(HttpNetworkSession* session) |
: session_(session), |
suspended_(false) { |
- DCHECK(session_.get()); |
+ DCHECK(session_); |
#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 |
} |
@@ -38,14 +38,6 @@ HttpNetworkLayer::~HttpNetworkLayer() { |
#endif |
} |
-// static |
-HttpTransactionFactory* HttpNetworkLayer::CreateFactory( |
- HttpNetworkSession* session) { |
- DCHECK(session); |
- |
- return new HttpNetworkLayer(session); |
-} |
- |
int HttpNetworkLayer::CreateTransaction(RequestPriority priority, |
scoped_ptr<HttpTransaction>* trans) { |
if (suspended_) |
@@ -59,13 +51,13 @@ HttpCache* HttpNetworkLayer::GetCache() { |
return NULL; |
} |
-HttpNetworkSession* HttpNetworkLayer::GetSession() { return session_.get(); } |
+HttpNetworkSession* HttpNetworkLayer::GetSession() { |
+ return session_; |
+} |
void HttpNetworkLayer::OnSuspend() { |
suspended_ = true; |
- |
- if (session_.get()) |
- session_->CloseIdleConnections(); |
+ session_->CloseIdleConnections(); |
} |
void HttpNetworkLayer::OnResume() { |