Replace MediaStreamUIController with MediaStreamUIProxy.

chrome/browser/media/media_stream_devices_controller.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_stream_devices_controller.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
@@ skipping 46 matching lines @@
       GetDevicePolicy(prefs::kAudioCaptureAllowed) == ALWAYS_DENY) {
     microphone_requested_ = false;
   }
 
   if (webcam_requested_ &&
       GetDevicePolicy(prefs::kVideoCaptureAllowed) == ALWAYS_DENY) {
     webcam_requested_ = false;
   }
 }
 
-MediaStreamDevicesController::~MediaStreamDevicesController() {}
+MediaStreamDevicesController::~MediaStreamDevicesController() {
+  if (!callback_.is_null()) {
+    callback_.Run(content::MediaStreamDevices(),
+                  scoped_ptr<content::MediaStreamUI>());
+  }
+}
 
 // static
 void MediaStreamDevicesController::RegisterUserPrefs(
     PrefRegistrySyncable* prefs) {
   prefs->RegisterBooleanPref(prefs::kVideoCaptureAllowed,
                              true,
                              PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kAudioCaptureAllowed,
                              true,
                              PrefRegistrySyncable::UNSYNCABLE_PREF);
@@ skipping 87 matching lines @@
     if (update_content_setting && IsSchemeSecure() && !devices.empty())
       SetPermission(true);
   }
 
   scoped_ptr<content::MediaStreamUI> ui;
   if (!devices.empty()) {
     ui = MediaCaptureDevicesDispatcher::GetInstance()->
         GetMediaStreamCaptureIndicator()->RegisterMediaStream(
             web_contents_, devices);
   }
-  callback_.Run(devices, ui.Pass());
+  content::MediaResponseCallback cb = callback_;
+  callback_.Reset();
+  cb.Run(devices, ui.Pass());
 }
 
 void MediaStreamDevicesController::Deny(bool update_content_setting) {
   // TODO(markusheintz): Replace CONTENT_SETTINGS_TYPE_MEDIA_STREAM with the
   // appropriate new CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC and
   // CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA.
   if (content_settings_) {
     content_settings_->OnContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM,
                                         std::string());
   }
 
   if (update_content_setting)
     SetPermission(false);
 
-  callback_.Run(content::MediaStreamDevices(),
-                scoped_ptr<content::MediaStreamUI>());
+  content::MediaResponseCallback cb = callback_;
+  callback_.Reset();
+  cb.Run(content::MediaStreamDevices(), scoped_ptr<content::MediaStreamUI>());
 }
 
 MediaStreamDevicesController::DevicePolicy
 MediaStreamDevicesController::GetDevicePolicy(const char* policy_name) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   PrefService* prefs = profile_->GetPrefs();
   if (!prefs->IsManagedPreference(policy_name))
     return POLICY_NOT_SET;
 
@@ skipping 107 matching lines @@
   }
   if (webcam_requested_) {
     profile_->GetHostContentSettingsMap()->SetContentSetting(
         primary_pattern,
         ContentSettingsPattern::Wildcard(),
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
         std::string(),
         content_setting);
   }
 }