Index: chrome/common/chrome_content_client.cc |
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc |
index f4414936e8e0e89a3495aec4073693e75ea35484..17698278d7b8b996070bab5592b0ce3a43708fb6 100644 |
--- a/chrome/common/chrome_content_client.cc |
+++ b/chrome/common/chrome_content_client.cc |
@@ -430,6 +430,12 @@ std::string GetUserAgent() { |
return content::BuildUserAgentFromProduct(product); |
} |
+ChromeContentClient::ChromeContentClient() { |
+} |
+ |
+ChromeContentClient::~ChromeContentClient() { |
+} |
+ |
#if !defined(DISABLE_NACL) |
void ChromeContentClient::SetNaClEntryFunctions( |
content::PepperPluginInfo::GetInterfaceFunc get_interface, |
@@ -700,8 +706,11 @@ bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { |
#endif |
} |
-base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() { |
- return origin_trial_key_manager_.GetPublicKey(); |
+content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { |
+ if (!origin_trial_policy_) { |
+ origin_trial_policy_ = base::WrapUnique(new ChromeOriginTrialPolicy()); |
+ } |
+ return origin_trial_policy_.get(); |
} |
#if defined(OS_ANDROID) |