Index: chrome/browser/media/cast_transport_host_filter.cc |
diff --git a/chrome/browser/media/cast_transport_host_filter.cc b/chrome/browser/media/cast_transport_host_filter.cc |
index 89feefdbd4ab4b1c2749f602e0956623a2a488c8..df512f740c784de8f302e3de1477928435e54761 100644 |
--- a/chrome/browser/media/cast_transport_host_filter.cc |
+++ b/chrome/browser/media/cast_transport_host_filter.cc |
@@ -12,8 +12,12 @@ |
#include "chrome/common/cast_messages.h" |
#include "components/net_log/chrome_net_log.h" |
#include "content/public/browser/browser_thread.h" |
-#include "device/power_save_blocker/power_save_blocker.h" |
+#include "content/public/common/service_manager_connection.h" |
+#include "device/wake_lock/public/interfaces/wake_lock_provider.mojom.h" |
#include "media/cast/net/cast_transport.h" |
+#include "mojo/public/cpp/bindings/interface_request.h" |
+#include "services/device/public/interfaces/constants.mojom.h" |
+#include "services/service_manager/public/cpp/connector.h" |
namespace { |
@@ -100,6 +104,16 @@ class RtcpClient : public media::cast::RtcpObserver { |
DISALLOW_COPY_AND_ASSIGN(RtcpClient); |
}; |
+void BindConnectorRequest( |
+ service_manager::mojom::ConnectorRequest connector_request) { |
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
+ DCHECK(content::ServiceManagerConnection::GetForProcess()); |
+ |
+ content::ServiceManagerConnection::GetForProcess() |
+ ->GetConnector() |
+ ->BindConnectorRequest(std::move(connector_request)); |
+} |
+ |
} // namespace |
namespace cast { |
@@ -148,17 +162,10 @@ void CastTransportHostFilter::OnNew(int32_t channel_id, |
const net::IPEndPoint& local_end_point, |
const net::IPEndPoint& remote_end_point, |
const base::DictionaryValue& options) { |
- if (!power_save_blocker_) { |
+ if (id_map_.IsEmpty()) { |
DVLOG(1) << ("Preventing the application from being suspended while one or " |
"more transports are active for Cast Streaming."); |
- power_save_blocker_.reset(new device::PowerSaveBlocker( |
- device::PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, |
- device::PowerSaveBlocker::kReasonOther, |
- "Cast is streaming content to a remote receiver", |
- content::BrowserThread::GetTaskRunnerForThread( |
- content::BrowserThread::UI), |
- content::BrowserThread::GetTaskRunnerForThread( |
- content::BrowserThread::FILE))); |
+ GetWakeLockService()->RequestWakeLock(); |
} |
if (id_map_.Lookup(channel_id)) { |
@@ -201,10 +208,10 @@ void CastTransportHostFilter::OnDelete(int32_t channel_id) { |
stream_id_map_.erase(channel_id); |
if (id_map_.IsEmpty()) { |
- DVLOG_IF(1, power_save_blocker_) << |
- ("Releasing the block on application suspension since no transports " |
- "are active anymore for Cast Streaming."); |
- power_save_blocker_.reset(); |
+ DVLOG(1) |
+ << ("Releasing the block on application suspension since no transports " |
+ "are active anymore for Cast Streaming."); |
+ GetWakeLockService()->CancelWakeLock(); |
} |
} |
@@ -390,4 +397,32 @@ void CastTransportHostFilter::OnCastRemotingSenderEvents( |
std::vector<media::cast::PacketEvent>(), events)); |
} |
+device::mojom::WakeLockService* CastTransportHostFilter::GetWakeLockService() { |
+ // Here is a lazy binding, and will not reconnect after connection error. |
+ if (!wake_lock_) { |
+ device::mojom::WakeLockServiceRequest request = |
+ mojo::MakeRequest(&wake_lock_); |
+ |
+ // Service manager connection might be not initialized in some testing |
+ // contexts. |
+ if (content::ServiceManagerConnection::GetForProcess()) { |
+ service_manager::mojom::ConnectorRequest connector_request; |
+ auto connector = service_manager::Connector::Create(&connector_request); |
+ |
+ content::BrowserThread::PostTask( |
+ content::BrowserThread::UI, FROM_HERE, |
+ base::BindOnce(&BindConnectorRequest, std::move(connector_request))); |
+ |
+ device::mojom::WakeLockProviderPtr wake_lock_provider; |
+ connector->BindInterface(device::mojom::kServiceName, |
+ mojo::MakeRequest(&wake_lock_provider)); |
+ wake_lock_provider->GetWakeLockWithoutContext( |
+ device::mojom::WakeLockType::PreventAppSuspension, |
+ device::mojom::WakeLockReason::ReasonOther, |
+ "Cast is streaming content to a remote receiver", std::move(request)); |
+ } |
+ } |
+ return wake_lock_.get(); |
+} |
+ |
} // namespace cast |