Skip to content

GitLab

T
tangled
Commit c4ba17c5 authored by iclelland's avatar iclelland Committed by Commit bot
Browse files
Options

[Experimental Framework] Rename meta tag name for origin trials 

BUG=575808

Review URL: https://codereview.chromium.org/1682473002

Cr-Commit-Position: refs/heads/master@{#374746}
parent 65d5a9e4
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
third_party/WebKit/LayoutTests/http/tests/origin_trials/sample-api-broken.html
View file @ c4ba17c5
<!DOCTYPE html> <!DOCTYPE html>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="api-experiments" content="I am a website so Frobulate is yes" /> <meta name="origin-trials" content="I am a website so Frobulate is yes" />
<title>Test Sample API when trial is disabled (invalid token)</title> <title>Test Sample API when trial is disabled (invalid token)</title>
<script src="../resources/testharness.js"></script> <script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script> <script src="../resources/testharness-helpers.js"></script>
......
third_party/WebKit/LayoutTests/http/tests/origin_trials/sample-api-enabled.html
View file @ c4ba17c5
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- TODO(iclelland): Generate this sample token during the build. The token <!-- TODO(iclelland): Generate this sample token during the build. The token
below will expire in 2033, but it would be better to always have a token which below will expire in 2033, but it would be better to always have a token which
is guaranteed to be valid when the tests are run. --> is guaranteed to be valid when the tests are run. -->
<meta name="api-experiments" content="vwg3nKe6n5/EXh83rDzj1/AOL/FkpXP8CMC53/kjWcOH1smcZuzp431/5bEf39ZPOh6P2sjKsl/LPL7nIoycAg==|http://127.0.0.1:8000|Frobulate|2000000000"> <meta name="origin-trials" content="vwg3nKe6n5/EXh83rDzj1/AOL/FkpXP8CMC53/kjWcOH1smcZuzp431/5bEf39ZPOh6P2sjKsl/LPL7nIoycAg==|http://127.0.0.1:8000|Frobulate|2000000000">
<title>Test Sample API when trial is enabled</title> <title>Test Sample API when trial is enabled</title>
<script src="../resources/testharness.js"></script> <script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script> <script src="../resources/testharness-helpers.js"></script>
......
third_party/WebKit/LayoutTests/http/tests/origin_trials/sample-api-expired.html
View file @ c4ba17c5
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- TODO(iclelland): Generate this sample key during the build. The key below <!-- TODO(iclelland): Generate this sample key during the build. The key below
will expire in 2033, but it would be better to always have a key which is will expire in 2033, but it would be better to always have a key which is
guaranteed to be valid when the tests are run. --> guaranteed to be valid when the tests are run. -->
<meta name="api-experiments" content="ktI/SoAgEf1rzplbPPeG44jQv/t4eVFkBq6K22TBP++y3rQurg/RL5iuisXrTlBimad9rlKqOn9MgQKj+O4MDw==|http://127.0.0.1:8000|Frobulate|1000000000" /> <meta name="origin-trials" content="ktI/SoAgEf1rzplbPPeG44jQv/t4eVFkBq6K22TBP++y3rQurg/RL5iuisXrTlBimad9rlKqOn9MgQKj+O4MDw==|http://127.0.0.1:8000|Frobulate|1000000000" />
<title>Test Sample API when trial has expired</title> <title>Test Sample API when trial has expired</title>
<script src="../resources/testharness.js"></script> <script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script> <script src="../resources/testharness-helpers.js"></script>
......
third_party/WebKit/LayoutTests/http/tests/origin_trials/sample-api-multiple-tokens.html
View file @ c4ba17c5
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<!-- TODO(iclelland): Generate these sample tokens during the build. The tokens <!-- TODO(iclelland): Generate these sample tokens during the build. The tokens
below will expire in 2033, but it would be better to always have tokens which below will expire in 2033, but it would be better to always have tokens which
are guaranteed to be valid when the tests are run. --> are guaranteed to be valid when the tests are run. -->
<meta name="api-experiments" content="0Z9yc32TDc+Jmn5LbxRS9b4AcU5mBdJR3SG42cfiq84ferbaogVMNqJnyQHAFJ1cbe4gywThVX4w+ZYcktfIBA==|http://127.0.0.1:8000|Grokalyze|2000000000" /> <meta name="origin-trials" content="0Z9yc32TDc+Jmn5LbxRS9b4AcU5mBdJR3SG42cfiq84ferbaogVMNqJnyQHAFJ1cbe4gywThVX4w+ZYcktfIBA==|http://127.0.0.1:8000|Grokalyze|2000000000" />
<meta name="api-experiments" content="vwg3nKe6n5/EXh83rDzj1/AOL/FkpXP8CMC53/kjWcOH1smcZuzp431/5bEf39ZPOh6P2sjKsl/LPL7nIoycAg==|http://127.0.0.1:8000|Frobulate|2000000000" /> <meta name="origin-trials" content="vwg3nKe6n5/EXh83rDzj1/AOL/FkpXP8CMC53/kjWcOH1smcZuzp431/5bEf39ZPOh6P2sjKsl/LPL7nIoycAg==|http://127.0.0.1:8000|Frobulate|2000000000" />
<meta name="api-experiments" content="CVmciymFpxQj8T1ywqJLpNAIUqVLKMmeMSvYqL27XsJZhwFGS3Dl3igRUnzE5GByOUe0fIrcyVDLA7n8KovqAw==|http://127.0.0.1:8000|EnableMarqueeTag|2000000000" /> <meta name="origin-trials" content="CVmciymFpxQj8T1ywqJLpNAIUqVLKMmeMSvYqL27XsJZhwFGS3Dl3igRUnzE5GByOUe0fIrcyVDLA7n8KovqAw==|http://127.0.0.1:8000|EnableMarqueeTag|2000000000" />
<title>Test Sample API when trial is enabled and multiple tokens are present</title> <title>Test Sample API when trial is enabled and multiple tokens are present</title>
<script src="../resources/testharness.js"></script> <script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script> <script src="../resources/testharness-helpers.js"></script>
......
third_party/WebKit/LayoutTests/http/tests/origin_trials/sample-api-stolen.html
View file @ c4ba17c5
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- TODO(iclelland): Generate this sample token during the build. The token <!-- TODO(iclelland): Generate this sample token during the build. The token
below will expire in 2033, but it would be better to always have a token which below will expire in 2033, but it would be better to always have a token which
is guaranteed to be valid when the tests are run. --> is guaranteed to be valid when the tests are run. -->
<meta name="api-experiments" content="1Rw1j+NkMF27TxRhpNJ5R28nLpbXwDjPKcKdLhTVFNoR5naMmIbYQgnFLPgQSRceq5KSgKb584zRWx2tacTkBw==|http://invalid.example.com|Frobulate|2000000000" /> <meta name="origin-trials" content="1Rw1j+NkMF27TxRhpNJ5R28nLpbXwDjPKcKdLhTVFNoR5naMmIbYQgnFLPgQSRceq5KSgKb584zRWx2tacTkBw==|http://invalid.example.com|Frobulate|2000000000" />
<title>Test Sample API when token is present for a different origin</title> <title>Test Sample API when token is present for a different origin</title>
<script src="../resources/testharness.js"></script> <script src="../resources/testharness.js"></script>
<script src="../resources/testharness-helpers.js"></script> <script src="../resources/testharness-helpers.js"></script>
......
third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
View file @ c4ba17c5
...@@ -17,7 +17,7 @@ namespace blink { ...@@ -17,7 +17,7 @@ namespace blink {
namespace { namespace {
const char kTrialMetaTagName[] = "api-experiments"; const char kTrialMetaTagName[] = "origin-trials";
String getCurrentOrigin(ExecutionContext* executionContext) String getCurrentOrigin(ExecutionContext* executionContext)
{ {
......
third_party/WebKit/Source/core/origin_trials/OriginTrialContextTest.cpp
View file @ c4ba17c5
...@@ -124,7 +124,7 @@ protected: ...@@ -124,7 +124,7 @@ protected:
ASSERT_TRUE(head); ASSERT_TRUE(head);
RefPtrWillBeRawPtr<HTMLMetaElement> meta = HTMLMetaElement::create(document()); RefPtrWillBeRawPtr<HTMLMetaElement> meta = HTMLMetaElement::create(document());
meta->setAttribute(HTMLNames::nameAttr, "api-experiments"); meta->setAttribute(HTMLNames::nameAttr, "origin-trials");
AtomicString value(token); AtomicString value(token);
meta->setAttribute(HTMLNames::contentAttr, value); meta->setAttribute(HTMLNames::contentAttr, value);
head->appendChild(meta.release()); head->appendChild(meta.release());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment