ui: Fix more GYP TODOs.

There aren't many TODO(GYP) remaning and these are the ones I can do
since I don't have a Mac yet.

Tested with the following command line:

$ gn gen --args='os="android" cpu_arch="arm"' out_gn_android/Debug

BUG=None
TEST=see above
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/895443002

Cr-Commit-Position: refs/heads/master@{#314182}

ui/gfx/BUILD.gn

@@ -287,10 +287,9 @@ component("gfx") {
       sources -= [ "path.cc" ]
     }
 
-    # TODO(GYP) re-enable when base_java exists.
-    #if (!is_android_webview_build) {
-    #  deps += [ "//base:base_java" ]
-    #}
+    if (!is_android_webview_build) {
+      deps += [ "//base:base_java" ]
+    }
 
     if (!is_debug) {
       configs -= [ "//build/config/compiler:optimize" ]
@@ -515,10 +514,6 @@ test("gfx_unittests") {
       # does not compile display_observer.cc
       "display_change_notifier_unittest.cc",
     ]
-
-    deps += [
-      #'../../testing/android/native_test.gyp:native_test_native_code', TODO(GYP)
-    ]
   }
 
   if (is_android || is_ios) {

ui/shell_dialogs/BUILD.gn

@@ -58,7 +58,7 @@ component("shell_dialogs") {
     libs = [ "jnigraphics" ]
 
     if (!is_android_webview_build) {
-      #deps += [ '../android/ui_android.gyp:ui_java' ]  TODO(GYP)
+      deps += [ "//ui/android:ui_java" ]
     }
   }