| Index: content/public/android/BUILD.gn
 | 
| diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
 | 
| index 031505aa020233f0d13e7a0e73b75ec228bebae9..12866939d436e837966727ec4022311000503f93 100644
 | 
| --- a/content/public/android/BUILD.gn
 | 
| +++ b/content/public/android/BUILD.gn
 | 
| @@ -49,6 +49,7 @@ android_library("content_java") {
 | 
|      "//media/midi:midi_java",
 | 
|      "//media/mojo/interfaces:interfaces_java",
 | 
|      "//mojo/android:system_java",
 | 
| +    "//mojo/common:common_custom_types_java",
 | 
|      "//mojo/public/java:bindings_java",
 | 
|      "//mojo/public/java:system_java",
 | 
|      "//net/android:net_java",
 | 
| @@ -166,8 +167,12 @@ android_library("content_java") {
 | 
|      "java/src/org/chromium/content/browser/accessibility/captioning/KitKatCaptioningBridge.java",
 | 
|      "java/src/org/chromium/content/browser/accessibility/captioning/SystemCaptioningBridge.java",
 | 
|      "java/src/org/chromium/content/browser/accessibility/captioning/TextTrackSettings.java",
 | 
| -    "java/src/org/chromium/content/browser/androidoverlay/AndroidOverlayImpl.java",
 | 
|      "java/src/org/chromium/content/browser/androidoverlay/AndroidOverlayProviderImpl.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayCore.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayImpl.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayOperations.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayOperationsImpl.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/ThreadHoppingHost.java",
 | 
|      "java/src/org/chromium/content/browser/crypto/ByteArrayGenerator.java",
 | 
|      "java/src/org/chromium/content/browser/crypto/CipherFactory.java",
 | 
|      "java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
 | 
| @@ -347,6 +352,7 @@ generate_jni("content_jni_headers") {
 | 
|      "java/src/org/chromium/content/browser/SpeechRecognition.java",
 | 
|      "java/src/org/chromium/content/browser/TracingControllerAndroid.java",
 | 
|      "java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityManager.java",
 | 
| +    "java/src/org/chromium/content/browser/androidoverlay/DialogOverlayOperationsImpl.java",
 | 
|      "java/src/org/chromium/content/browser/framehost/NavigationControllerImpl.java",
 | 
|      "java/src/org/chromium/content/browser/framehost/RenderFrameHostImpl.java",
 | 
|      "java/src/org/chromium/content/browser/input/DateTimeChooserAndroid.java",
 | 
| @@ -385,7 +391,9 @@ android_library("content_javatests") {
 | 
|      "//media/base/android:media_java",
 | 
|      "//media/capture/content/android:screen_capture_java",
 | 
|      "//media/capture/video/android:capture_java",
 | 
| +    "//media/mojo/interfaces:interfaces_java",
 | 
|      "//mojo/android:system_java",
 | 
| +    "//mojo/common:common_custom_types_java",
 | 
|      "//mojo/public/interfaces/bindings/tests:test_interfaces_java",
 | 
|      "//mojo/public/java:bindings_java",
 | 
|      "//mojo/public/java:system_java",
 | 
| @@ -396,6 +404,7 @@ android_library("content_javatests") {
 | 
|      "//third_party/android_tools:legacy_http_javalib",
 | 
|      "//third_party/junit",
 | 
|      "//ui/android:ui_java",
 | 
| +    "//ui/gfx/geometry/mojo:mojo_java",
 | 
|    ]
 | 
|  
 | 
|    java_files = [
 | 
| @@ -445,6 +454,7 @@ android_library("content_javatests") {
 | 
|      "javatests/src/org/chromium/content/browser/ViewportTest.java",
 | 
|      "javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java",
 | 
|      "javatests/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegateTest.java",
 | 
| +    "javatests/src/org/chromium/content/browser/androidoverlay/DialogOverlayImplTest.java",
 | 
|      "javatests/src/org/chromium/content/browser/crypto/CipherFactoryTest.java",
 | 
|      "javatests/src/org/chromium/content/browser/input/CursorAnchorInfoControllerTest.java",
 | 
|      "javatests/src/org/chromium/content/browser/input/ImeLollipopTest.java",
 | 
| @@ -469,6 +479,7 @@ android_library("content_javatests") {
 | 
|  
 | 
|  junit_binary("content_junit_tests") {
 | 
|    java_files = [
 | 
| +    "junit/src/org/chromium/content/browser/androidoverlay/DialogOverlayCoreTest.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/ThreadedInputConnectionFactoryTest.java",
 | 
| @@ -481,7 +492,9 @@ junit_binary("content_junit_tests") {
 | 
|      ":content_java",
 | 
|      "//base:base_java",
 | 
|      "//base:base_java_test_support",
 | 
| +    "//media/mojo/interfaces:interfaces_java",
 | 
|      "//mojo/public/java:bindings_java",
 | 
|      "//third_party/WebKit/public:android_mojo_bindings_java",
 | 
| +    "//ui/gfx/geometry/mojo:mojo_java",
 | 
|    ]
 | 
|  }
 | 
| 
 |