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));
-  if (!media_stream_capture_indicator_.get())
-    media_stream_capture_indicator_ = new MediaStreamCaptureIndicator();
   media_stream_capture_indicator_->CaptureDevicesOpened(render_process_id,
                                                         render_view_id,
                                                         devices);
 }
 
 void MediaInternals::OnCaptureDevicesClosed(
     int render_process_id,
     int render_view_id,
     const content::MediaStreamDevices& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 22 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_);
 }
 
-MediaInternals::MediaInternals() {}
+scoped_refptr<MediaStreamCaptureIndicator>
+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);
 }
 
 void MediaInternals::DeleteItem(const std::string& item) {
   data_.Remove(item, NULL);
@@ skipping 16 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));
   }
 }