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

Unified Diff: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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/origin_trials/OriginTrialContext.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
index 6d9cc0f2ebea3175a26ab5a9bd746130bf6dc4a2..ae76e45bf3e223645e336f66eec5aedaaea7744d 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
@@ -19,7 +19,7 @@ namespace {
String getCurrentOrigin(ExecutionContext* executionContext)
{
- return executionContext->securityOrigin()->toString();
+ return executionContext->getSecurityOrigin()->toString();
}
String getDisabledMessage(const String& featureName)
@@ -49,8 +49,8 @@ bool OriginTrialContext::isFeatureEnabled(const String& featureName, String* err
// Feature trials are only enabled for secure origins
bool isSecure = errorMessage
- ? executionContext()->isSecureContext(*errorMessage)
- : executionContext()->isSecureContext();
+ ? getExecutionContext()->isSecureContext(*errorMessage)
+ : getExecutionContext()->isSecureContext();
if (!isSecure) {
// The execution context should always set a message here, if a valid
// pointer was passed in. If it does not, then we should find out why
@@ -74,7 +74,7 @@ bool OriginTrialContext::isFeatureEnabled(const String& featureName, String* err
bool OriginTrialContext::hasValidToken(Vector<String> tokens, const String& featureName, String* errorMessage, WebTrialTokenValidator* validator)
{
- String origin = getCurrentOrigin(executionContext());
+ String origin = getCurrentOrigin(getExecutionContext());
for (const String& token : tokens) {
// Check with the validator service to verify the signature.

Powered by Google App Engine
This is Rietveld 408576698