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

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: Rebase master Created 4 years, 2 months 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/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index e146ead682286b435300ebecc374e154c9ec6d76..0ec5ba2d8d4c89595ff3230474cfa2ec1fa1a7b4 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -1711,7 +1711,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());
@@ -2591,8 +2592,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());

Powered by Google App Engine
This is Rietveld 408576698