| Index: chrome/common/chrome_content_client.h
|
| diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
|
| index de1f8953fd464dd43aa306568e4f41dfb3574f50..fdf0549f7d06004d135ef507d82e320ed234f3da 100644
|
| --- a/chrome/common/chrome_content_client.h
|
| +++ b/chrome/common/chrome_content_client.h
|
| @@ -11,7 +11,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/files/file_path.h"
|
| #include "build/build_config.h"
|
| -#include "chrome/common/origin_trials/origin_trial_key_manager.h"
|
| +#include "chrome/common/origin_trials/chrome_origin_trial_policy.h"
|
| #include "content/public/common/content_client.h"
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| @@ -90,20 +90,16 @@ class ChromeContentClient : public content::ContentClient {
|
| bool AllowScriptExtensionForServiceWorker(const GURL& script_url) override;
|
|
|
| bool IsSupplementarySiteIsolationModeEnabled() override;
|
| - base::StringPiece GetOriginTrialPublicKey() const override;
|
|
|
| void InitializeOriginTrialPolicy() override;
|
| - OriginTrialKeyManager* origin_trial_key_manager() {
|
| - return &origin_trial_key_manager_;
|
| - }
|
| - bool IsOriginTrialFeatureDisabled(base::StringPiece feature) const override;
|
| + const content::OriginTrialPolicy* GetOriginTrialPolicy() const override;
|
|
|
| #if defined(OS_ANDROID)
|
| media::MediaClientAndroid* GetMediaClientAndroid() override;
|
| #endif // OS_ANDROID
|
|
|
| private:
|
| - OriginTrialKeyManager origin_trial_key_manager_;
|
| + ChromeOriginTrialPolicy origin_trial_policy_;
|
| };
|
|
|
| #endif // CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
|
|
|