chrome/browser/background/background_application_list_model_unittest.cc - Issue 11365181: Remove GetExtensionService from Profile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/background/background_application_list_model_unittest.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

« no previous file with comments | « chrome/browser/background/background_application_list_model.cc ('k') | chrome/browser/background/background_contents_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/background/background_application_list_model_unittest.cc

diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc

index 14e88c25a6a7d5a6abb1625f5848503e5c8e21b6..b1b1afc7392c20476377373d3545b1a4d78b8615 100644

--- a/chrome/browser/background/background_application_list_model_unittest.cc

+++ b/chrome/browser/background/background_application_list_model_unittest.cc

@@ -17,6 +17,7 @@

#include "base/stl_util.h"

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_service_unittest.h"

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/permissions_updater.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_manifest_constants.h"

@@ -122,7 +123,8 @@ void RemoveBackgroundPermission(ExtensionService* service,

// extensions, of which some are Background Apps and others are not.

TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {

InitializeAndLoadEmptyExtensionService();

- ExtensionService* service = profile_->GetExtensionService();

+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->

+ extension_service();

ASSERT_TRUE(service);

ASSERT_TRUE(service->is_ready());

ASSERT_TRUE(service->extensions());

@@ -188,7 +190,8 @@ TEST_F(BackgroundApplicationListModelTest, ExplicitTest) {

// With minimal test logic, verifies behavior with dynamic permissions.

TEST_F(BackgroundApplicationListModelTest, AddRemovePermissionsTest) {

InitializeAndLoadEmptyExtensionService();

- ExtensionService* service = profile_->GetExtensionService();

+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->

+ extension_service();

ASSERT_TRUE(service);

ASSERT_TRUE(service->is_ready());

ASSERT_TRUE(service->extensions());

@@ -337,7 +340,8 @@ void TogglePermission(ExtensionService* service,

// removing extensions, of which some are Background Apps and others are not.

TEST_F(BackgroundApplicationListModelTest, RandomTest) {

InitializeAndLoadEmptyExtensionService();

- ExtensionService* service = profile_->GetExtensionService();

+ ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->

+ extension_service();

ASSERT_TRUE(service);

ASSERT_TRUE(service->is_ready());

ASSERT_TRUE(service->extensions());