Remove ContextLifecycleObserver from NotificationManager

third_party/WebKit/Source/modules/notifications/NotificationManager.cpp

 // 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 "modules/notifications/NotificationManager.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "modules/notifications/Notification.h"
 #include "modules/notifications/NotificationPermissionCallback.h"
@@ skipping 10 matching lines @@
 
 // static
 NotificationManager* NotificationManager::from(
     ExecutionContext* executionContext) {
   DCHECK(executionContext);
   DCHECK(executionContext->isContextThread());
 
   NotificationManager* manager = static_cast<NotificationManager*>(
       Supplement<ExecutionContext>::from(executionContext, supplementName()));
   if (!manager) {
-    manager = new NotificationManager(executionContext);
+    manager = new NotificationManager();
     Supplement<ExecutionContext>::provideTo(*executionContext, supplementName(),
                                             manager);
   }
 
   return manager;
 }
 
 // static
 const char* NotificationManager::supplementName() {
   return "NotificationManager";
 }
 
-NotificationManager::NotificationManager(ExecutionContext* executionContext)
-    : ContextLifecycleObserver(executionContext) {}
+NotificationManager::NotificationManager() {}
 
 NotificationManager::~NotificationManager() {}
 
-mojom::blink::PermissionStatus NotificationManager::permissionStatus() {
+mojom::blink::PermissionStatus NotificationManager::permissionStatus(
+    ExecutionContext* executionContext) {
   if (!m_notificationService)
     Platform::current()->interfaceProvider()->getInterface(
         mojo::GetProxy(&m_notificationService));
 
   mojom::blink::PermissionStatus permissionStatus;
   const bool result = m_notificationService->GetPermissionStatus(
-      getExecutionContext()->getSecurityOrigin()->toString(),
-      &permissionStatus);
+      executionContext->getSecurityOrigin()->toString(), &permissionStatus);
   DCHECK(result);
 
   return permissionStatus;
 }
 
 ScriptPromise NotificationManager::requestPermission(
     ScriptState* scriptState,
     NotificationPermissionCallback* deprecatedCallback) {
   ExecutionContext* context = scriptState->getExecutionContext();
 
@@ skipping 12 matching lines @@
       context->getSecurityOrigin(),
       UserGestureIndicator::processingUserGesture(),
       convertToBaseCallback(
           WTF::bind(&NotificationManager::onPermissionRequestComplete,
                     wrapPersistent(this), wrapPersistent(resolver),
                     wrapPersistent(deprecatedCallback))));
 
   return promise;
 }
 
-void NotificationManager::contextDestroyed() {
-  m_notificationService.reset();
-  m_permissionService.reset();

[haraken, 2016/12/07 06:56:06]

As far as I understand, there is no benefit in resetting the service pointers.
It looks like that most Mojo clients are not doing the resetting.

-}
-
 void NotificationManager::onPermissionRequestComplete(
     ScriptPromiseResolver* resolver,
     NotificationPermissionCallback* deprecatedCallback,
     mojom::blink::PermissionStatus status) {
   String statusString = Notification::permissionString(status);
   if (deprecatedCallback)
     deprecatedCallback->handleEvent(statusString);
 
   resolver->resolve(statusString);
 }
 
 void NotificationManager::onPermissionServiceConnectionError() {
   if (!Platform::current()) {
     // TODO(rockot): Clean this up once renderer shutdown sequence is fixed.
     return;
   }
   m_permissionService.reset();
 }
 
 DEFINE_TRACE(NotificationManager) {
-  ContextLifecycleObserver::trace(visitor);
   Supplement<ExecutionContext>::trace(visitor);
 }
 
 }  // namespace blink