Do FilteringNetworkManager::CheckPermission from new Initialize method.

content/renderer/p2p/filtering_network_manager.cc

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..b83fe6949b4018a520dd427cd8a2f03c064b0abc 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() {
+  if (media_permission_) {

[Sergey Ulanov, 2016/07/07 18:09:08]

nit: remove {} for consistency with other single-line if statements in this
file.

[Sergey Ulanov, 2016/07/07 18:09:08]

Call NetworkManager::Initialize() to initialize the parent class.

[Taylor_Brandstetter, 2016/07/07 21:30:28]

I assume you meant NetworkManagerBase; if so, done.

[Taylor_Brandstetter, 2016/07/07 21:30:28]

Done.

+    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() {

[Taylor_Brandstetter, 2016/06/29 23:34:23]

Just moved this to match where it is in the header file; nothing has changed.

+  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);