| Index: content/renderer/p2p/filtering_network_manager.cc
|
| diff --git a/content/renderer/p2p/filtering_network_manager.cc b/content/renderer/p2p/filtering_network_manager.cc
|
| index 667e199b95696b861d5869a4ee2e43fc75e64493..4112d56f51308971479ce54f9aabf500e66de97f 100644
|
| --- a/content/renderer/p2p/filtering_network_manager.cc
|
| +++ b/content/renderer/p2p/filtering_network_manager.cc
|
| @@ -34,22 +34,6 @@ FilteringNetworkManager::FilteringNetworkManager(
|
| }
|
| }
|
|
|
| -void FilteringNetworkManager::CheckPermission() {
|
| - DCHECK(thread_checker_.CalledOnValidThread());
|
| - DCHECK(!started_permission_check_);
|
| -
|
| - started_permission_check_ = true;
|
| - pending_permission_checks_ = 2;
|
| -
|
| - // Request for media permission asynchronously.
|
| - media_permission_->HasPermission(
|
| - media::MediaPermission::AUDIO_CAPTURE, requesting_origin_,
|
| - base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
|
| - media_permission_->HasPermission(
|
| - media::MediaPermission::VIDEO_CAPTURE, requesting_origin_,
|
| - base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
|
| -}
|
| -
|
| FilteringNetworkManager::~FilteringNetworkManager() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| // This helps to catch the case if permission never comes back.
|
| @@ -61,6 +45,12 @@ base::WeakPtr<FilteringNetworkManager> FilteringNetworkManager::GetWeakPtr() {
|
| return weak_ptr_factory_.GetWeakPtr();
|
| }
|
|
|
| +void FilteringNetworkManager::Initialize() {
|
| + rtc::NetworkManagerBase::Initialize();
|
| + if (media_permission_)
|
| + CheckPermission();
|
| +}
|
| +
|
| void FilteringNetworkManager::StartUpdating() {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK(started_permission_check_);
|
| @@ -101,6 +91,22 @@ bool FilteringNetworkManager::GetDefaultLocalAddress(
|
| return network_manager_->GetDefaultLocalAddress(family, ipaddress);
|
| }
|
|
|
| +void FilteringNetworkManager::CheckPermission() {
|
| + DCHECK(thread_checker_.CalledOnValidThread());
|
| + DCHECK(!started_permission_check_);
|
| +
|
| + started_permission_check_ = true;
|
| + pending_permission_checks_ = 2;
|
| +
|
| + // Request for media permission asynchronously.
|
| + media_permission_->HasPermission(
|
| + media::MediaPermission::AUDIO_CAPTURE, requesting_origin_,
|
| + base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
|
| + media_permission_->HasPermission(
|
| + media::MediaPermission::VIDEO_CAPTURE, requesting_origin_,
|
| + base::Bind(&FilteringNetworkManager::OnPermissionStatus, GetWeakPtr()));
|
| +}
|
| +
|
| void FilteringNetworkManager::OnPermissionStatus(bool granted) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| DCHECK_GT(pending_permission_checks_, 0);
|
|
|