| Index: chrome/browser/chromeos/file_manager/file_browser_handlers.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
|
| index 7599c8baf7f72e3e400c6400dd26a00cfc12cccf..27af32e12c7f3bef9b4ab328878997fbeba0a8e1 100644
|
| --- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
|
| +++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
|
| @@ -31,6 +31,7 @@
|
| #include "content/public/browser/web_contents.h"
|
| #include "extensions/browser/event_router.h"
|
| #include "extensions/browser/extension_host.h"
|
| +#include "extensions/browser/extension_registry.h"
|
| #include "extensions/browser/extension_system.h"
|
| #include "extensions/browser/extension_util.h"
|
| #include "extensions/browser/lazy_background_task_queue.h"
|
| @@ -103,10 +104,10 @@ std::string EscapedUtf8ToLower(const std::string& str) {
|
| FileBrowserHandlerList FindFileBrowserHandlersForURL(
|
| Profile* profile,
|
| const GURL& selected_file_url) {
|
| - ExtensionService* service =
|
| - extensions::ExtensionSystem::Get(profile)->extension_service();
|
| - // In unit-tests, we may not have an ExtensionService.
|
| - if (!service)
|
| + extensions::ExtensionRegistry* registry =
|
| + extensions::ExtensionRegistry::Get(profile);
|
| + // In unit-tests, we may not have an ExtensionRegistry.
|
| + if (!registry)
|
| return FileBrowserHandlerList();
|
|
|
| // We need case-insensitive matching, and pattern in the handler is already
|
| @@ -114,10 +115,8 @@ FileBrowserHandlerList FindFileBrowserHandlersForURL(
|
| const GURL lowercase_url(EscapedUtf8ToLower(selected_file_url.spec()));
|
|
|
| FileBrowserHandlerList results;
|
| - for (extensions::ExtensionSet::const_iterator iter =
|
| - service->extensions()->begin();
|
| - iter != service->extensions()->end(); ++iter) {
|
| - const Extension* extension = iter->get();
|
| + for (const scoped_refptr<const Extension>& extension :
|
| + registry->enabled_extensions()) {
|
| if (profile->IsOffTheRecord() &&
|
| !extensions::util::IsIncognitoEnabled(extension->id(), profile))
|
| continue;
|
| @@ -125,7 +124,7 @@ FileBrowserHandlerList FindFileBrowserHandlersForURL(
|
| continue;
|
|
|
| FileBrowserHandler::List* handler_list =
|
| - FileBrowserHandler::GetHandlers(extension);
|
| + FileBrowserHandler::GetHandlers(extension.get());
|
| if (!handler_list)
|
| continue;
|
| for (FileBrowserHandler::List::const_iterator handler_iter =
|
|
|