| Index: content/public/android/BUILD.gn
 | 
| diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 | 
| index 259bf182dbf4fe19c67389dd9697688f33932d27..3dd789ec65d7d1f6839e8aa5ad2637975ec0957d 100644
 | 
| --- a/content/public/android/BUILD.gn
 | 
| +++ b/content/public/android/BUILD.gn
 | 
| @@ -35,6 +35,7 @@ android_library("content_java") {
 | 
|      "//device/battery:mojo_bindings_java",
 | 
|      "//device/battery/android:battery_monitor_android",
 | 
|      "//device/bluetooth:java",
 | 
| +    "//device/gamepad:java",
 | 
|      "//device/power_save_blocker:java",
 | 
|      "//device/usb:java",
 | 
|      "//device/vibration:mojo_bindings_java",
 | 
| @@ -162,9 +163,6 @@ android_library("content_java") {
 | 
|      "java/src/org/chromium/content/browser/input/CursorAnchorInfoController.java",
 | 
|      "java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java",
 | 
|      "java/src/org/chromium/content/browser/input/FloatingPastePopupMenu.java",
 | 
| -    "java/src/org/chromium/content/browser/input/GamepadDevice.java",
 | 
| -    "java/src/org/chromium/content/browser/input/GamepadList.java",
 | 
| -    "java/src/org/chromium/content/browser/input/GamepadMappings.java",
 | 
|      "java/src/org/chromium/content/browser/input/HandleViewResources.java",
 | 
|      "java/src/org/chromium/content/browser/input/ImeAdapter.java",
 | 
|      "java/src/org/chromium/content/browser/input/ImeUtils.java",
 | 
| @@ -266,7 +264,6 @@ java_cpp_enum("content_public_android_java_enums_srcjar") {
 | 
|      "//content/browser/android/gesture_event_type.h",
 | 
|      "//content/browser/device_sensors/device_sensors_consts.h",
 | 
|      "//content/browser/device_sensors/sensor_manager_android.h",
 | 
| -    "//content/browser/gamepad/gamepad_standard_mappings.h",
 | 
|      "//content/public/browser/invalidate_type.h",
 | 
|      "//content/public/browser/navigation_controller.h",
 | 
|      "//content/public/browser/readback_types.h",
 | 
| @@ -388,7 +385,6 @@ android_library("content_javatests") {
 | 
|  # GYP: //content/content_tests.gypi:content_junit_tests
 | 
|  junit_binary("content_junit_tests") {
 | 
|    java_files = [
 | 
| -    "junit/src/org/chromium/content/browser/input/GamepadMappingsTest.java",
 | 
|      "junit/src/org/chromium/content/browser/input/RangeTest.java",
 | 
|      "junit/src/org/chromium/content/browser/input/TextInputStateTest.java",
 | 
|      "junit/src/org/chromium/content/browser/input/ThreadedInputConnectionTest.java",
 | 
| 
 |