Allow command-line arguments to override EF public key

chrome/common/chrome_content_client.h

Index: chrome/common/chrome_content_client.h
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index 227f737d75ebd1b2f19c2f44e0318a5b34e5f842..0fa6beeb5eb5370d5f5fccda5e03a33ff22dbd76 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -87,7 +87,11 @@ class ChromeContentClient : public content::ContentClient {
   void AddServiceWorkerSchemes(std::set<std::string>* schemes) override;
 
   bool IsSupplementarySiteIsolationModeEnabled() override;
+  void InitializeOriginTrials() override;
   base::StringPiece GetOriginTrialPublicKey() override;
+  OriginTrialKeyManager* GetOriginTrialKeyManager() {

[sky, 2016/04/14 16:19:51]

nit: origin_trial_key_manager() . Also, provide a newline from the previous
function as it looks like its part of the previous overrides when it isn't.

[iclelland, 2016/04/14 19:29:07]

Done, thanks. (Should show up in the next patchset)

+    return &origin_trial_key_manager_;
+  }
 
  private:
   OriginTrialKeyManager origin_trial_key_manager_;