Index: chrome/app/chrome_main_delegate.cc |
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
index 22ed2aa8b65964e7a3610be177e29f07a6fe52c1..1c0852bc0ceb830a4337a2bd853f62154bf0abdb 100644 |
--- a/chrome/app/chrome_main_delegate.cc |
+++ b/chrome/app/chrome_main_delegate.cc |
@@ -636,12 +636,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) { |
} |
#endif |
- if (command_line.HasSwitch(switches::kOriginTrialPublicKey)) { |
- chrome_content_client_.origin_trial_key_manager() |
- ->SetPublicKeyFromASCIIString( |
- command_line.GetSwitchValueASCII(switches::kOriginTrialPublicKey)); |
- } |
- |
+ chrome_content_client_.InitializeOriginTrialPolicy(); |
jochen (gone - plz use gerrit)
2016/06/20 11:44:56
chrome shouldn't call content's embedder APIs. Why
iclelland
2016/06/20 18:08:40
This was a temporary situation (as a result of ref
iclelland
2016/06/21 03:33:34
I think the only reason I hadn't made InitializeOr
|
content::SetContentClient(&chrome_content_client_); |
#if defined (OS_CHROMEOS) |