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

Issue 488693003: Revert of Close all active PeerConnections upon OS suspend (Closed)

Created:
6 years, 3 months ago by scottmg
Modified:
6 years, 3 months ago
CC:
chromium-reviews, posciak+watch_chromium.org, jam, mcasas+watch_chromium.org, feature-media-reviews_chromium.org, darin-cc_chromium.org, wjia+watch_chromium.org, pthatcher1
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

Revert of Close all active PeerConnections upon OS suspend (patchset #3 of https://codereview.chromium.org/465153003/) Reason for revert: Causing browser crashes due to race, BUG=404767 Original issue's description: > Close all active PeerConnections upon OS suspend > > BUG=403618 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=290125 TBR=jiayl@chromium.org,juberti@chromium.org,nasko@chromium.org,vrk@chromium.org NOTREECHECKS=true NOTRY=true BUG=403618

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+4 lines, -38 lines) Patch
M content/browser/renderer_host/media/peer_connection_tracker_host.h View 3 chunks +3 lines, -9 lines 0 comments Download
M content/browser/renderer_host/media/peer_connection_tracker_host.cc View 3 chunks +1 line, -17 lines 0 comments Download
M content/common/media/peer_connection_tracker_messages.h View 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/media/peer_connection_tracker.h View 1 chunk +0 lines, -3 lines 0 comments Download
M content/renderer/media/peer_connection_tracker.cc View 2 chunks +0 lines, -8 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
scottmg
Created Revert of Close all active PeerConnections upon OS suspend
6 years, 3 months ago (2014-08-25 23:03:05 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/488693003/1
6 years, 3 months ago (2014-08-25 23:06:37 UTC) #2
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 3 months ago (2014-08-25 23:10:55 UTC) #3
commit-bot: I haz the power
6 years, 3 months ago (2014-08-25 23:10:56 UTC) #4
Failed to apply patch for
content/browser/renderer_host/media/peer_connection_tracker_host.cc:
While running git apply --index -p1;
  error: patch failed:
content/browser/renderer_host/media/peer_connection_tracker_host.cc:91
  error: content/browser/renderer_host/media/peer_connection_tracker_host.cc:
patch does not apply

Patch:       content/browser/renderer_host/media/peer_connection_tracker_host.cc
Index: content/browser/renderer_host/media/peer_connection_tracker_host.cc
diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.cc
b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
index
a88d5c4b5c0393f0efa046f14c77a751c9af4b0e..ac863e7eb898e825ed504abcb11b8dc7a83adb9a
100644
--- a/content/browser/renderer_host/media/peer_connection_tracker_host.cc
+++ b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
@@ -3,20 +3,14 @@
 // found in the LICENSE file.
 #include "content/browser/renderer_host/media/peer_connection_tracker_host.h"
 
-#include "base/power_monitor/power_monitor.h"
 #include "content/browser/media/webrtc_internals.h"
 #include "content/common/media/peer_connection_tracker_messages.h"
-#include "content/public/browser/render_process_host.h"
 
 namespace content {
 
 PeerConnectionTrackerHost::PeerConnectionTrackerHost(int render_process_id)
     : BrowserMessageFilter(PeerConnectionTrackerMsgStart),
-      render_process_id_(render_process_id) {
-  base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
-  if (power_monitor)
-    power_monitor->AddObserver(this);
-}
+      render_process_id_(render_process_id) {}
 
 bool PeerConnectionTrackerHost::OnMessageReceived(const IPC::Message& message)
{
   bool handled = true;
@@ -42,9 +36,6 @@
 }
 
 PeerConnectionTrackerHost::~PeerConnectionTrackerHost() {
-  base::PowerMonitor* power_monitor = base::PowerMonitor::Get();
-  if (power_monitor)
-    power_monitor->RemoveObserver(this);
 }
 
 void PeerConnectionTrackerHost::OnAddPeerConnection(
@@ -91,11 +82,4 @@
                                                  video_constraints);
 }
 
-void PeerConnectionTrackerHost::OnSuspend() {
-  content::RenderProcessHost* host =
-      content::RenderProcessHost::FromID(render_process_id_);
-  CHECK(host);
-  host->Send(new PeerConnectionTracker_OnSuspend());
-}
-
 }  // namespace content

Powered by Google App Engine
This is Rietveld 408576698