chrome/browser/extensions/extension_service_unittest.cc - Issue 2206693002: Improve settings override bubble to indicate policy installed extensions

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/extensions/extension_service_unittest.cc

Issue 2206693002: Improve settings override bubble to indicate policy installed extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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/extensions/extension_service_test_with_install.cc ('k') | chrome/browser/extensions/ntp_overridden_bubble_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service_unittest.cc

diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc

index 839c43d11b1ea45526eac3380371d0eabcb63908..fab816aa76640f5551ef839acb2a7040d6df4a02 100644

--- a/chrome/browser/extensions/extension_service_unittest.cc

+++ b/chrome/browser/extensions/extension_service_unittest.cc

@@ -1712,7 +1712,8 @@ TEST_F(ExtensionServiceTest, DefaultAppsGrantedPermissions) {

EXPECT_FALSE(prefs->GetGrantedPermissions(permissions_crx).get());

const Extension* extension = PackAndInstallCRX(

- path, pem_path, INSTALL_NEW, Extension::WAS_INSTALLED_BY_DEFAULT);

+ path, pem_path, INSTALL_NEW, Extension::WAS_INSTALLED_BY_DEFAULT,

+ Manifest::Location::INTERNAL);

EXPECT_EQ(0u, GetErrors().size());

ASSERT_EQ(1u, registry()->enabled_extensions().size());

@@ -2592,8 +2593,8 @@ TEST_F(ExtensionServiceTest, UpdateExtensionPreservesLocation) {

InitializeEmptyExtensionService();

base::FilePath path = data_dir().AppendASCII("good.crx");

- const Extension* good =

- InstallCRXWithLocation(path, Manifest::EXTERNAL_PREF, INSTALL_NEW);

+ const Extension* good = InstallCRX(path, Manifest::EXTERNAL_PREF, INSTALL_NEW,

+ Extension::NO_FLAGS);

ASSERT_EQ("1.0.0.0", good->VersionString());

ASSERT_EQ(good_crx, good->id());