"Fix" remaining connection error handlers in Blink

third_party/WebKit/Source/modules/sensor/SensorProviderProxy.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/sensor/SensorProviderProxy.h"
 
 #include "modules/sensor/SensorProxy.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
+#include "public/platform/Platform.h"
 
 namespace blink {
 
 // SensorProviderProxy
 SensorProviderProxy::SensorProviderProxy(LocalFrame* frame) {
   frame->interfaceProvider()->getInterface(mojo::GetProxy(&m_sensorProvider));
   m_sensorProvider.set_connection_error_handler(convertToBaseCallback(
       WTF::bind(&SensorProviderProxy::onSensorProviderConnectionError,
                 wrapWeakPersistent(this))));
 }
@@ skipping 28 matching lines @@
       return sensor;
   }
 
   SensorProxy* sensor = new SensorProxy(type, this);
   m_sensors.add(sensor);
 
   return sensor;
 }
 
 void SensorProviderProxy::onSensorProviderConnectionError() {
+  if (!Platform::current()) {
+    // TODO(rockot): Clean this up once renderer shutdown sequence is fixed.
+    return;
+  }
+
   m_sensorProvider.reset();
   for (SensorProxy* sensor : m_sensors)
     sensor->handleSensorError();
 }
 
 }  // namespace blink