| Index: chrome/browser/download/download_browsertest.cc
|
| diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
|
| index 51e27dee3ffe7a64d3b2bc4c6c44982483c65e5c..7a5cea4dffeac8f6508733770a6eb0f55071cf32 100644
|
| --- a/chrome/browser/download/download_browsertest.cc
|
| +++ b/chrome/browser/download/download_browsertest.cc
|
| @@ -30,6 +30,7 @@
|
| #include "chrome/browser/download/download_util.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/history/download_row.h"
|
| #include "chrome/browser/history/history.h"
|
| #include "chrome/browser/history/history_service_factory.h"
|
| @@ -1533,8 +1534,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxDenyInstall) {
|
| EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
|
|
|
| // Check that the CRX is not installed.
|
| - ExtensionService* extension_service =
|
| - browser()->profile()->GetExtensionService();
|
| + ExtensionService* extension_service = extensions::ExtensionSystem::Get(
|
| + browser()->profile())->extension_service();
|
| ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
|
| }
|
|
|
| @@ -1571,8 +1572,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInstallDenysPermissions) {
|
| EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
|
|
|
| // Check that the extension was not installed.
|
| - ExtensionService* extension_service =
|
| - browser()->profile()->GetExtensionService();
|
| + ExtensionService* extension_service = extensions::ExtensionSystem::Get(
|
| + browser()->profile())->extension_service();
|
| ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
|
| }
|
|
|
| @@ -1608,8 +1609,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInstallAcceptPermissions) {
|
| EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
|
|
|
| // Check that the extension was installed.
|
| - ExtensionService* extension_service =
|
| - browser()->profile()->GetExtensionService();
|
| + ExtensionService* extension_service = extensions::ExtensionSystem::Get(
|
| + browser()->profile())->extension_service();
|
| ASSERT_TRUE(extension_service->GetExtensionById(kGoodCrxId, false));
|
| }
|
|
|
| @@ -1634,8 +1635,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxInvalid) {
|
| CheckDownloadStates(1, DownloadItem::COMPLETE);
|
|
|
| // Check that the extension was not installed.
|
| - ExtensionService* extension_service =
|
| - browser()->profile()->GetExtensionService();
|
| + ExtensionService* extension_service = extensions::ExtensionSystem::Get(
|
| + browser()->profile())->extension_service();
|
| ASSERT_FALSE(extension_service->GetExtensionById(kGoodCrxId, false));
|
| }
|
|
|
| @@ -1670,8 +1671,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, CrxLargeTheme) {
|
| EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
|
|
|
| // Check that the extension was installed.
|
| - ExtensionService* extension_service =
|
| - browser()->profile()->GetExtensionService();
|
| + ExtensionService* extension_service = extensions::ExtensionSystem::Get(
|
| + browser()->profile())->extension_service();
|
| ASSERT_TRUE(extension_service->GetExtensionById(kLargeThemeCrxId, false));
|
| }
|
|
|
|
|