ui: Fix more GYP TODOs.

ui/gfx/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 268 matching lines @@
       "canvas_skia.cc",
       "selection_model.cc",
     ]
 
     if (use_aura) {
       sources -= [ "screen_android.cc" ]
     } else {
       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" ]
       configs += [ "//build/config/compiler:optimize_max" ]
     }
 
     deps += [ ":gfx_jni_headers" ]
     libs = [
       "android",
       "jnigraphics",
@@ skipping 204 matching lines @@
       "text_elider_unittest.cc",
     ]
   }
 
   if (is_android) {
     sources -= [
       # Do not run display_change_notifier_unittest.cc on Android because it
       # 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) {
     sources -= [ "render_text_unittest.cc" ]
   }
 
   if (use_aura) {
     sources -= [ "screen_unittest.cc" ]
   }
 
@@ skipping 27 matching lines @@
 if (is_android) {
   generate_jni("gfx_jni_headers") {
     sources = [
       "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
       "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
       "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
     ]
     jni_package = "gfx"
   }
 }