chrome/browser/extensions/extension_service_test_with_install.cc - Issue 2004043002: Supervised Users Initiated Installs v2

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_test_with_install.cc

Issue 2004043002: Supervised Users Initiated Installs v2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@kid_initiated_install

Patch Set: Response to code review from Marc Created 4 years, 6 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

« chrome/browser/extensions/extension_service_sync_unittest.cc ('K') | « chrome/browser/extensions/extension_service_sync_unittest.cc ('k') | chrome/browser/extensions/extension_sync_service.cc » ('j') | chrome/browser/supervised_user/supervised_user_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service_test_with_install.cc

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

index fda8c4ba9514794d3d743691ea354c13de45d68a..d5510fbc474cacc8a479eb5310f6078416ade74f 100644

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

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

@@ -197,7 +197,7 @@ const Extension* ExtensionServiceTestWithInstall::VerifyCrxInstall(

std::vector<base::string16> errors = GetErrors();

const Extension* extension = nullptr;

if (install_state != INSTALL_FAILED) {

- if (install_state == INSTALL_NEW)

+ if (install_state == INSTALL_NEW || install_state == INSTALL_WITHOUT_LOAD)

++expected_extensions_count_;

EXPECT_TRUE(installed_) << path.value();

@@ -211,6 +211,7 @@ const Extension* ExtensionServiceTestWithInstall::VerifyCrxInstall(

if (install_state == INSTALL_WITHOUT_LOAD) {

EXPECT_EQ(0u, loaded_.size()) << path.value();

+ extension = installed_;

} else {

EXPECT_EQ(1u, loaded_.size()) << path.value();

size_t actual_extension_count =