Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(202)

Unified Diff: third_party/WebKit/Source/core/testing/OriginTrialsTest.cpp

Issue 2340323002: Add Origin Trials Test interface, rather than attaching trials directly to internals. (Closed)
Patch Set: Updates Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/testing/OriginTrialsTest.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp b/third_party/WebKit/Source/core/testing/OriginTrialsTest.cpp
similarity index 57%
rename from third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp
rename to third_party/WebKit/Source/core/testing/OriginTrialsTest.cpp
index 3a199e6f9e913ddb64292d0d49f82c725a482342..026c1a0fe0ab7ae0ff528a117ca4b935b5777151 100644
--- a/third_party/WebKit/Source/core/origin_trials/testing/InternalsFrobulate.cpp
+++ b/third_party/WebKit/Source/core/testing/OriginTrialsTest.cpp
@@ -1,8 +1,8 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/origin_trials/testing/InternalsFrobulate.h"
+#include "OriginTrialsTest.h"
#include "bindings/core/v8/ExceptionState.h"
#include "core/dom/ExceptionCode.h"
@@ -10,21 +10,34 @@
namespace blink {
+bool OriginTrialsTest::normalAttribute()
+{
+ return true;
+}
+
// static
-bool InternalsFrobulate::frobulate(ScriptState* scriptState, Internals& internals, ExceptionState& exceptionState)
+bool OriginTrialsTest::staticAttribute()
+{
+ return true;
+}
+
+bool OriginTrialsTest::throwingAttribute(ScriptState* scriptState, ExceptionState& exceptionState)
{
String errorMessage;
if (!OriginTrials::originTrialsSampleAPIEnabled(scriptState->getExecutionContext())) {
exceptionState.throwDOMException(NotSupportedError, "The Origin Trials Sample API has not been enabled in this context");
return false;
}
- return frobulateNoEnabledCheck(internals);
+ return unconditionalAttribute();
}
-// static
-bool InternalsFrobulate::frobulateNoEnabledCheck(Internals& internals)
+bool OriginTrialsTest::unconditionalAttribute()
{
return true;
}
+DEFINE_TRACE(OriginTrialsTest)
+{
+}
+
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/core/testing/OriginTrialsTest.h ('k') | third_party/WebKit/Source/core/testing/OriginTrialsTest.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698