| Index: chrome/browser/chromeos/extensions/file_manager_util.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| index 381966f3931d67e75ab4a48e17cc0372e765ba45..006380129d0316547ac8187d10d66f4583c8e87b 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
|
| @@ -25,6 +25,7 @@
|
| #include "chrome/browser/extensions/crx_installer.h"
|
| #include "chrome/browser/extensions/extension_install_prompt.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| +#include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| @@ -515,7 +516,8 @@ void OpenFileBrowser(const FilePath& path,
|
| url += "#/" + net::EscapeUrlEncodedData(virtual_path.value(), false);
|
| }
|
|
|
| - ExtensionService* service = profile->GetExtensionService();
|
| + ExtensionService* service =
|
| + extensions::ExtensionSystem::Get(profile)->extension_service();
|
| if (!service)
|
| return;
|
|
|
| @@ -767,7 +769,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
|
| GetFileBrowserExtensionUrl().GetOrigin(), &url))
|
| return false;
|
|
|
| - ExtensionService* service = profile->GetExtensionService();
|
| + ExtensionService* service =
|
| + extensions::ExtensionSystem::Get(profile)->extension_service();
|
| if (!service)
|
| return false;
|
|
|
| @@ -812,7 +815,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
|
| }
|
|
|
| void InstallCRX(Browser* browser, const FilePath& path) {
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service =
|
| + extensions::ExtensionSystem::Get(browser->profile())->extension_service();
|
| CHECK(service);
|
|
|
| content::WebContents* web_contents =
|
|
|