From 67f486d991d883a5b3438f8ca820860e9979170d Mon Sep 17 00:00:00 2001 From: mek Date: Fri, 11 Mar 2016 17:34:18 -0800 Subject: 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} --- content/public/renderer/content_renderer_client.cc | 4 ---- content/public/renderer/content_renderer_client.h | 4 ---- 2 files changed, 8 deletions(-) (limited to 'content/public/renderer') 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 -- cgit v1.1