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 b7d81d2582171c87d31170fcf474316d533b67cd..3a6b26ffa770af1930f4337880f7272faaeac1d6 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() const { |
- return origin_trial_public_key_; |
+const OriginTrialPolicy* ShellContentClient::GetOriginTrialPolicy() const { |
+ return &origin_trial_policy_; |
} |
} // namespace content |