Index: third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
diff --git a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
index 3645dda02520e92b144f4b51d847c53dc31fc139..5039dbab7b6c718112a0ef01d3ed814a7f104de9 100644 |
--- a/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
+++ b/third_party/WebKit/Source/modules/sensor/SensorProviderProxy.cpp |
@@ -7,6 +7,7 @@ |
#include "modules/sensor/SensorProxy.h" |
#include "platform/mojo/MojoHelper.h" |
#include "public/platform/InterfaceProvider.h" |
+#include "public/platform/Platform.h" |
namespace blink { |
@@ -55,6 +56,11 @@ SensorProxy* SensorProviderProxy::getOrCreateSensor( |
} |
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(); |