"Fix" remaining connection error handlers in Blink

third_party/WebKit/Source/modules/quota/StorageManager.cpp

 // Copyright 2015 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/quota/StorageManager.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/modules/v8/V8StorageEstimate.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
@@ skipping 132 matching lines @@
   if (!m_permissionService &&
       connectToPermissionService(executionContext,
                                  mojo::GetProxy(&m_permissionService)))
     m_permissionService.set_connection_error_handler(convertToBaseCallback(
         WTF::bind(&StorageManager::permissionServiceConnectionError,
                   wrapWeakPersistent(this))));
   return m_permissionService.get();
 }
 
 void StorageManager::permissionServiceConnectionError() {
+  if (!Platform::current()) {
+    // TODO(rockot): Clean this up once renderer shutdown sequence is fixed.
+    return;
+  }
+
   m_permissionService.reset();
 }
 
 void StorageManager::permissionRequestComplete(ScriptPromiseResolver* resolver,
                                                PermissionStatus status) {
   if (!resolver->getExecutionContext() ||
       resolver->getExecutionContext()->activeDOMObjectsAreStopped())
     return;
   resolver->resolve(status == PermissionStatus::GRANTED);
 }
 
 }  // namespace blink