Merge SecurityOrigin::canAccessCheckSuborigins into canAccess

third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

 // Copyright 2014 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 "modules/serviceworkers/NavigatorServiceWorker.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 39 matching lines @@
 const char* NavigatorServiceWorker::supplementName() {
   return "NavigatorServiceWorker";
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     ScriptState* scriptState,
     Navigator& navigator,
     ExceptionState& exceptionState) {
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   DCHECK(!navigator.frame() ||
-         executionContext->getSecurityOrigin()->canAccessCheckSuborigins(
+         executionContext->getSecurityOrigin()->canAccess(
              navigator.frame()->securityContext()->getSecurityOrigin()));
   return NavigatorServiceWorker::from(navigator).serviceWorker(
       navigator.frame(), exceptionState);
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     ScriptState* scriptState,
     Navigator& navigator,
     String& errorMessage) {
   ExecutionContext* executionContext = scriptState->getExecutionContext();
   DCHECK(!navigator.frame() ||
-         executionContext->getSecurityOrigin()->canAccessCheckSuborigins(
+         executionContext->getSecurityOrigin()->canAccess(
              navigator.frame()->securityContext()->getSecurityOrigin()));
   return NavigatorServiceWorker::from(navigator).serviceWorker(
       navigator.frame(), errorMessage);
 }
 
 ServiceWorkerContainer* NavigatorServiceWorker::serviceWorker(
     LocalFrame* frame,
     ExceptionState& exceptionState) {
   String errorMessage;
   ServiceWorkerContainer* result = serviceWorker(frame, errorMessage);
@@ skipping 38 matching lines @@
 void NavigatorServiceWorker::clearServiceWorker() {
   m_serviceWorker = nullptr;
 }
 
 DEFINE_TRACE(NavigatorServiceWorker) {
   visitor->trace(m_serviceWorker);
   Supplement<Navigator>::trace(visitor);
 }
 
 }  // namespace blink