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

Unified Diff: content/public/browser/content_browser_client.h

Issue 2784433002: Ensures that audio tasks cannot run after AudioManager is deleted. (Closed)
Patch Set: cleanup Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 080a98d6fb1fc04a1ec478412511a7600cdaab88..8effb74e956d46d86d7f24eae39a0c5e07f076e8 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -25,7 +25,6 @@
#include "content/public/common/service_info.h"
#include "content/public/common/socket_permission_request.h"
#include "content/public/common/window_container_type.mojom.h"
-#include "media/audio/audio_manager.h"
#include "media/media_features.h"
#include "media/mojo/interfaces/remoting.mojom.h"
#include "net/base/mime_util.h"
@@ -61,6 +60,8 @@ class GpuChannelEstablishFactory;
}
namespace media {
+class AudioLogFactory;
+class AudioManager;
class CdmFactory;
}
@@ -772,7 +773,7 @@ class CONTENT_EXPORT ContentBrowserClient {
// Allows the embedder to provide its own AudioManager implementation.
// If this function returns nullptr, a default platform implementation
// will be used.
- virtual media::ScopedAudioManagerPtr CreateAudioManager(
+ virtual std::unique_ptr<media::AudioManager> CreateAudioManager(
media::AudioLogFactory* audio_log_factory);
// Creates and returns a factory used for creating CDM instances for playing
// protected content.

Powered by Google App Engine
This is Rietveld 408576698