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

Unified Diff: media/mojo/services/media_service.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. 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
« no previous file with comments | « media/mojo/services/interface_factory_impl.cc ('k') | media/mojo/services/media_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/media_service.h
diff --git a/media/mojo/services/media_service.h b/media/mojo/services/media_service.h
index 441717628ed4081e460cb4484fae005a26b2e5c1..e77e4ddf475e1d76521667edc12d00770dff289e 100644
--- a/media/mojo/services/media_service.h
+++ b/media/mojo/services/media_service.h
@@ -12,6 +12,7 @@
#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
+#include "media/base/media_log.h"
#include "media/mojo/interfaces/interface_factory.mojom.h"
#include "media/mojo/interfaces/media_service.mojom.h"
#include "media/mojo/services/media_mojo_export.h"
@@ -25,7 +26,6 @@
namespace media {
-class MediaLog;
class MojoMediaClient;
class MEDIA_MOJO_EXPORT MediaService
@@ -59,7 +59,7 @@ class MEDIA_MOJO_EXPORT MediaService
// a unique_ptr here.
std::unique_ptr<MojoMediaClient> mojo_media_client_;
- scoped_refptr<MediaLog> media_log_;
+ MediaLog media_log_;
std::unique_ptr<service_manager::ServiceContextRefFactory> ref_factory_;
service_manager::BinderRegistry registry_;
« no previous file with comments | « media/mojo/services/interface_factory_impl.cc ('k') | media/mojo/services/media_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698