Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1066)

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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));
}
« no previous file with comments | « chrome/browser/download/chrome_download_manager_delegate.cc ('k') | chrome/browser/download/download_crx_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698