diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h | |
parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h b/chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h index 2a31580b5f6..dda09977493 100644 --- a/chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h +++ b/chromium/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.h @@ -25,7 +25,7 @@ class WebTrialTokenValidator; // context. This class is not for direct use by feature implementers. // Instead, the OriginTrials generated namespace provides a method for each // trial to check if it is enabled. Experimental features must be defined in -// RuntimeEnabledFeatures.in, which is used to generate OriginTrials.h/cpp. +// RuntimeEnabledFeatures.json5, which is used to generate OriginTrials.h/cpp. // // Origin trials are defined by string names, provided by the implementers. The // framework does not maintain an enum or constant list for trial names. @@ -40,7 +40,7 @@ class CORE_EXPORT OriginTrialContext final public: enum CreateMode { CreateIfNotExists, DontCreateIfNotExists }; - OriginTrialContext(ExecutionContext*, WebTrialTokenValidator*); + OriginTrialContext(ExecutionContext&, WebTrialTokenValidator*); static const char* supplementName(); @@ -90,7 +90,6 @@ class CORE_EXPORT OriginTrialContext final // the token is valid. bool enableTrialFromToken(const String& token); - Member<ExecutionContext> m_host; Vector<String> m_tokens; HashSet<String> m_enabledTrials; HashSet<String> m_installedTrials; |