chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc - Issue 695133005: Temporarily disable extensions and sync while a profile is locked - Profiles Approach

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/api/screenlock_private/screenlock_private_apitest.cc

Issue 695133005: Temporarily disable extensions and sync while a profile is locked - Profiles Approach (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test. Don't lock policy-forced extensions. Created 6 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

« chrome/browser/background/background_contents_service.cc ('K') | « chrome/browser/background/background_contents_service.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | chrome/browser/extensions/extension_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

index 0c22acd83fa74de24b7c49d0a585daf52d869310..662563770f0c05ba91f0742b29132ea136981edd 100644

--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc

@@ -73,14 +73,9 @@ class ScreenlockPrivateApiTest : public ExtensionApiTest,

}

- // Loads |extension_name| as appropriate for the platform and waits for a

- // pass / fail notification.

+ // Loads |extension_name| and waits for a pass / fail notification.

void RunTest(const std::string& extension_name) {

-#if defined(OS_CHROMEOS)

ASSERT_TRUE(RunComponentExtensionTest(extension_name)) << message_;

-#else

- ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;

-#endif

}

private: