Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(552)

Unified Diff: content/shell/common/shell_content_client.cc

Issue 2049783002: Refactor OriginTrialPolicy to be an abstract interface in content/public/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ef-add-revoked-feature-list
Patch Set: Switch to lazy initialization in ChromeContentClient Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/common/shell_content_client.h ('k') | content/shell/common/shell_origin_trial_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/common/shell_content_client.cc
diff --git a/content/shell/common/shell_content_client.cc b/content/shell/common/shell_content_client.cc
index 7f49a68910ae343d90c6d12bbe6a57850b739d6d..ea5ea1ccd82ddbb75d9fe1db37266f4b5e82fa8f 100644
--- a/content/shell/common/shell_content_client.cc
+++ b/content/shell/common/shell_content_client.cc
@@ -20,19 +20,6 @@
namespace content {
-namespace {
-
-// This is the public key which the content shell will use to enable origin
-// trial features.
-// TODO(iclelland): Update this comment with the location of the public and
-// private key files when the command-line tool CL lands
-static const uint8_t kOriginTrialPublicKey[] = {
- 0x75, 0x10, 0xac, 0xf9, 0x3a, 0x1c, 0xb8, 0xa9, 0x28, 0x70, 0xd2,
- 0x9a, 0xd0, 0x0b, 0x59, 0xe1, 0xac, 0x2b, 0xb7, 0xd5, 0xca, 0x1f,
- 0x64, 0x90, 0x08, 0x8e, 0xa8, 0xe0, 0x56, 0x3a, 0x04, 0xd0,
-};
-} // namespace
-
std::string GetShellUserAgent() {
std::string product = "Chrome/" CONTENT_SHELL_VERSION;
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
@@ -41,10 +28,7 @@ std::string GetShellUserAgent() {
return BuildUserAgentFromProduct(product);
}
-ShellContentClient::ShellContentClient()
- : origin_trial_public_key_(base::StringPiece(
- reinterpret_cast<const char*>(kOriginTrialPublicKey),
- arraysize(kOriginTrialPublicKey))) {}
+ShellContentClient::ShellContentClient() {}
ShellContentClient::~ShellContentClient() {}
@@ -112,8 +96,8 @@ bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
switches::kIsolateSitesForTesting);
}
-base::StringPiece ShellContentClient::GetOriginTrialPublicKey() {
- return origin_trial_public_key_;
+OriginTrialPolicy* ShellContentClient::GetOriginTrialPolicy() {
+ return &origin_trial_policy_;
}
} // namespace content
« no previous file with comments | « content/shell/common/shell_content_client.h ('k') | content/shell/common/shell_origin_trial_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698