diff options
| author | mek <mek@chromium.org> | 2016-03-11 17:34:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 01:36:42 +0000 |
| commit | 67f486d991d883a5b3438f8ca820860e9979170d (patch) | |
| tree | 0367654d761869af52b17f90adc8c91bc16404f3 /content/public/renderer | |
| parent | 9d9031149e43577cdd886068403ebb5817152531 (diff) | |
| download | chromium_src-67f486d991d883a5b3438f8ca820860e9979170d.zip chromium_src-67f486d991d883a5b3438f8ca820860e9979170d.tar.gz chromium_src-67f486d991d883a5b3438f8ca820860e9979170d.tar.bz2 | |
Move trial token code to content/common.
Moves content/renderer/origin_trials/trial_token.* to content/common, and
moves ContentRendererClient::GetOriginTrialPublicKey to ContentClient, to
enable verification of trial tokens from the browser process.
BUG=590873
Review URL: https://codereview.chromium.org/1742053002
Cr-Commit-Position: refs/heads/master@{#380823}
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, 0 insertions, 8 deletions
diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index f928d33..d32eccc 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -225,8 +225,4 @@ 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 52b397f..880550c 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -327,10 +327,6 @@ 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 |