Reland: Refactor DeviceMotionEventPump to use //device/generic_sensor instead of //device/sensors

device/generic_sensor/platform_sensor_provider_android.cc

 // 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 "device/generic_sensor/platform_sensor_provider_android.h"
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
 #include "device/generic_sensor/platform_sensor_android.h"
 #include "jni/PlatformSensorProvider_jni.h"
@@ skipping 10 matching lines @@
       base::LeakySingletonTraits<PlatformSensorProviderAndroid>>::get();
 }
 
 PlatformSensorProviderAndroid::PlatformSensorProviderAndroid() {
   JNIEnv* env = AttachCurrentThread();
   j_object_.Reset(Java_PlatformSensorProvider_create(env));
 }
 
 PlatformSensorProviderAndroid::~PlatformSensorProviderAndroid() = default;
 
+void PlatformSensorProviderAndroid::SetSensorManagerToNullForTesting() {
+  JNIEnv* env = AttachCurrentThread();
+  Java_PlatformSensorProvider_setSensorManagerToNullForTest(env,
+                                                            j_object_.obj());
+}
+
 void PlatformSensorProviderAndroid::CreateSensorInternal(
     mojom::SensorType type,
     mojo::ScopedSharedBufferMapping mapping,
     const CreateSensorCallback& callback) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> sensor = Java_PlatformSensorProvider_createSensor(
       env, j_object_.obj(), static_cast<jint>(type));
 
-  if (!sensor.obj())
+  if (!sensor.obj()) {
     callback.Run(nullptr);
+    return;
+  }
 
   scoped_refptr<PlatformSensorAndroid> concrete_sensor =
       new PlatformSensorAndroid(type, std::move(mapping), this, sensor);
   callback.Run(concrete_sensor);
 }
 
 }  // namespace device