Change MediaStreamCaptureIndicator back to ref counted

chrome/browser/media/media_internals.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_internals.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/media/media_internals_observer.h"
@@ skipping 51 matching lines @@
   dict.SetDouble("time", event.time.ToDoubleT());
   dict.Set("params", event.params.DeepCopy());
   SendUpdate("media.onMediaEvent", &dict);
 }
 
 void MediaInternals::OnCaptureDevicesOpened(
     int render_process_id,
     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);
 }
 
 void MediaInternals::OnCaptureDevicesClosed(
     int render_process_id,
     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);
 }
 
 void MediaInternals::OnMediaRequestStateChanged(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevice& device,
     content::MediaRequestState state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 11 matching lines @@
 void MediaInternals::RemoveObserver(MediaInternalsObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   observers_.RemoveObserver(observer);
 }
 
 void MediaInternals::SendEverything() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   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()) {
 }
 
 void MediaInternals::UpdateAudioStream(
     void* host, int stream_id, const std::string& property, Value* value) {
   std::string stream = base::StringPrintf("audio_streams.%p:%d",
                                           host, stream_id);
   UpdateItem("media.addAudioStream", stream, property, value);
 }
@@ skipping 19 matching lines @@
 
 void MediaInternals::SendUpdate(const std::string& function, Value* value) {
   // Only bother serializing the update to JSON if someone is watching.
   if (observers_.size()) {
     std::vector<const Value*> args;
     args.push_back(value);
     string16 update = content::WebUI::GetJavascriptCall(function, args);
     FOR_EACH_OBSERVER(MediaInternalsObserver, observers_, OnUpdate(update));
   }
 }