| Index: chrome/browser/media/media_capture_devices_dispatcher.cc
|
| diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| index dda868b69823404a145d4087e994e7ab6b6cc9e7..04eca4759cc1f9d6977ebfc6001af441a1c0aa8c 100644
|
| --- a/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
|
| @@ -54,10 +54,9 @@
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
|
| -#include "chrome/browser/extensions/extension_service.h"
|
| #include "extensions/browser/app_window/app_window.h"
|
| #include "extensions/browser/app_window/app_window_registry.h"
|
| -#include "extensions/browser/extension_system.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #endif
|
| @@ -222,10 +221,9 @@ const extensions::Extension* GetExtensionForOrigin(
|
| if (!security_origin.SchemeIs(extensions::kExtensionScheme))
|
| return NULL;
|
|
|
| - ExtensionService* extensions_service =
|
| - extensions::ExtensionSystem::Get(profile)->extension_service();
|
| const extensions::Extension* extension =
|
| - extensions_service->extensions()->GetByID(security_origin.host());
|
| + extensions::ExtensionRegistry::Get(profile)->GetExtensionById(
|
| + security_origin.host(), extensions::ExtensionRegistry::ENABLED);
|
| DCHECK(extension);
|
| return extension;
|
| }
|
|
|