Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index dff8332fdd420c5cf34b5d3e200e4faa1a295cbf..b8c3ebc6aa83e3cb4191b1eeabe2ceb37fbf7c38 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -141,6 +141,7 @@ |
#include "components/version_info/version_info.h" |
#include "components/wallpaper/wallpaper_manager_base.h" |
#include "content/public/browser/browser_thread.h" |
+#include "content/public/browser/media_capture_devices.h" |
#include "content/public/browser/notification_service.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/common/main_function_params.h" |
@@ -418,6 +419,9 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
CrasAudioHandler::Initialize( |
new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); |
+ content::MediaCaptureDevices::GetInstance()->AddVideoCaptureObserver( |
+ CrasAudioHandler::Get()); |
+ |
quirks::QuirksManager::Initialize( |
std::unique_ptr<quirks::QuirksManager::Delegate>( |
new quirks::QuirksManagerDelegateImpl()), |
@@ -919,6 +923,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
// Stops all in-flight OAuth2 token fetchers before the IO thread stops. |
DeviceOAuth2TokenServiceFactory::Shutdown(); |
+ content::MediaCaptureDevices::GetInstance()->RemoveAllVideoCaptureObservers(); |
+ |
// Shutdown after PostMainMessageLoopRun() which should destroy all observers. |
CrasAudioHandler::Shutdown(); |