diff options
| author | iclelland <iclelland@chromium.org> | 2016-02-12 12:22:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 20:24:07 +0000 |
| commit | 17b143af6e640744583640b405531b410569dd73 (patch) | |
| tree | 786f367e854fee48ef918f5e7ff7a1072ee7200b /content/public/renderer | |
| parent | efa9ef721be99f95f420258e467ee44d46ce041d (diff) | |
| download | chromium_src-17b143af6e640744583640b405531b410569dd73.zip chromium_src-17b143af6e640744583640b405531b410569dd73.tar.gz chromium_src-17b143af6e640744583640b405531b410569dd73.tar.bz2 | |
[Experimental Framework] Move the trial token public key out of content and into the embedder.
In order to make the code changes easier to reason about, this is now part 2
of a two-part commit.
Part 1: https://codereview.chromium.org/1680873002/
BUG=543220
Review URL: https://codereview.chromium.org/1653263005
Cr-Commit-Position: refs/heads/master@{#375244}
Diffstat (limited to 'content/public/renderer')
| -rw-r--r-- | content/public/renderer/content_renderer_client.cc | 4 | ||||
| -rw-r--r-- | content/public/renderer/content_renderer_client.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index d32eccc..f928d33 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -225,4 +225,8 @@ bool ContentRendererClient::ShouldEnforceWebRTCRoutingPreferences() { return true; } +base::StringPiece ContentRendererClient::GetOriginTrialPublicKey() { + return base::StringPiece(); +} + } // namespace content diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 880550c..52b397f 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -327,6 +327,10 @@ class CONTENT_EXPORT ContentRendererClient { // Whether this renderer should enforce preferences related to the WebRTC // routing logic, i.e. allowing multiple routes and non-proxied UDP. virtual bool ShouldEnforceWebRTCRoutingPreferences(); + + // Returns the public key to be used for origin trials, or an empty string if + // origin trials are not enabled in this context. + virtual base::StringPiece GetOriginTrialPublicKey(); }; } // namespace content |