chrome/common/chrome_content_client.cc - Issue 1737693002: Allow command-line arguments to override EF public key

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/common/chrome_content_client.cc

Issue 1737693002: Allow command-line arguments to override EF public key (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 8 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/common/chrome_content_client.h ('K') | « chrome/common/chrome_content_client.h ('k') | chrome/common/chrome_switches.h » ('j') | chrome/common/origin_trials/origin_trial_key_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/chrome_content_client.cc

diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc

index 4a2456f278f66a9a9ef94f3723c46f458e1cb281..63a25bda1ac7e1d32b5b031726a6878b79340046 100644

--- a/chrome/common/chrome_content_client.cc

+++ b/chrome/common/chrome_content_client.cc

@@ -643,6 +643,14 @@ bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {

#endif

}

+void ChromeContentClient::InitializeOriginTrials() {

+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

+ if (command_line->HasSwitch(switches::kOriginTrialPublicKey)) {

+ GetOriginTrialKeyManager()->SetPublicKeyFromASCIIString(

+ command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));

+ }

base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {

return origin_trial_key_manager_.GetPublicKey();

}