Adding MediaStreamManager.

content/browser/renderer_host/media/media_stream_device_settings.cc

 // Copyright (c) 2011 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 "content/browser/renderer_host/media/media_stream_device_settings.h"
 
 #include "base/stl_util-inl.h"
 #include "base/task.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/media/media_stream_settings_requester.h"
@@ skipping 26 matching lines @@
 };
 
 MediaStreamDeviceSettings::MediaStreamDeviceSettings(
     SettingsRequester* requester)
     : requester_(requester) {
   DCHECK(requester_);
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 }
 
 MediaStreamDeviceSettings::~MediaStreamDeviceSettings() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   STLDeleteValues(&requests_);
 }
 
 void MediaStreamDeviceSettings::RequestCaptureDeviceUsage(
     const std::string& label, int render_process_id, int render_view_id,
     const StreamOptions& request_options, const std::string& security_origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (requests_.find(label) != requests_.end()) {
     // Request with this id already exists.
-    requester_->Error(label);
+    requester_->SettingsError(label);
     return;
   }
 
   // Create a new request.
   requests_.insert(std::make_pair(label, new SettingsRequest(render_process_id,
                                                              render_view_id,
                                                              security_origin,
                                                              request_options)));
   // Ask for available devices.
   if (request_options.audio) {
     requester_->GetDevices(label, kAudioCapture);
   }
   if (request_options.video_option != StreamOptions::kNoCamera) {
     requester_->GetDevices(label, kVideoCapture);
   }
 }
 
 void MediaStreamDeviceSettings::AvailableDevices(
     const std::string& label, MediaStreamType stream_type,
     const StreamDeviceInfoArray& devices) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   SettingsRequests::iterator request_it = requests_.find(label);
   if (request_it == requests_.end()) {
     // Request with this id doesn't exist.
-    requester_->Error(label);
+    requester_->SettingsError(label);
     return;
   }
 
   // Add the answer for the request.
   SettingsRequest* request = request_it->second;
   request->devices[stream_type] = devices;
 
   // Check if we're done.
   size_t num_media_requests = 0;
   if (request->options.audio) {
@@ skipping 25 matching lines @@
       }
     }
     // Post result and delete request.
     requester_->DevicesAccepted(label, devices_to_use);
     requests_.erase(request_it);
     delete request;
   }
 }
 
 }  // namespace media_stream