Change MediaStreamCaptureIndicator back to ref counted

chrome/browser/media/media_internals.cc

Index: chrome/browser/media/media_internals.cc
diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc
index 559a2222e33cc635562ea3d418ede5b7ff5e1b18..919c3a7d9e6fd5bfd5fa8ed14f15fbcc76733148 100644
--- a/chrome/browser/media/media_internals.cc
+++ b/chrome/browser/media/media_internals.cc
@@ -69,7 +69,7 @@ void MediaInternals::OnCaptureDevicesOpened(
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  media_stream_capture_indicator()->CaptureDevicesOpened(render_process_id,
+  GetMediaStreamCaptureIndicator()->CaptureDevicesOpened(render_process_id,

[no longer working on chromium, 2012/10/26 08:11:20]

MeidaInternals owns the media_stream_capture_indicator_, why not simply call
media_stream_capture_indicator_ here

[stevenjb, 2012/10/26 20:35:08]

Yes, right, thanks. Done.

                                                          render_view_id,
                                                          devices);
 }
@@ -79,7 +79,7 @@ void MediaInternals::OnCaptureDevicesClosed(
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  media_stream_capture_indicator()->CaptureDevicesClosed(render_process_id,
+  GetMediaStreamCaptureIndicator()->CaptureDevicesClosed(render_process_id,

[no longer working on chromium, 2012/10/26 08:11:20]

ditto

[stevenjb, 2012/10/26 20:35:08]

Done.

                                                          render_view_id,
                                                          devices);
 }
@@ -111,6 +111,11 @@ void MediaInternals::SendEverything() {
   SendUpdate("media.onReceiveEverything", &data_);
 }
 
+scoped_refptr<MediaStreamCaptureIndicator>

[no longer working on chromium, 2012/10/26 08:11:20]

I think we don't need to return a scoped_refptr, clients get access to
media_stream_capture_indicator_ via MediaInternals which should go away before
MediaInternals, otherwise it will crash anyhow when trying to access
MediaInternals.
We can simply return a normal pointer here.

[stevenjb, 2012/10/26 20:35:08]

At the moment that is true. However, since this is a public accessor, I would
rather do this safely and remind the consumer (who will hopefully pay more
attention than I did) that they are dealing with a class that may get updated on
another thread.

+MediaInternals::GetMediaStreamCaptureIndicator() {
+  return media_stream_capture_indicator_.get();
+}
+
 MediaInternals::MediaInternals()
     : media_stream_capture_indicator_(new MediaStreamCaptureIndicator()) {
 }