Android: adds missing dependencies for gfx_unittests.

BUG=379037

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274483 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 41 insertions, 28 deletions

diff --git a/build/android/pylib/gtest/filter/gfx_unittests_disabled b/build/android/pylib/gtest/filter/gfx_unittests_disabled
new file mode 100644
index 0000000..aadc4de
--- /dev/null
+++ b/build/android/pylib/gtest/filter/gfx_unittests_disabled
@@ -0,0 +1,25 @@
+FontListTest.FontDescString_Derive
+FontListTest.FontDescString_FromFont
+FontListTest.FontDescString_FromFontNamesStyleAndSize
+FontListTest.FontDescString_FromFontVector
+FontListTest.FontDescString_FromFontWithNonNormalStyle
+FontListTest.Fonts_Derive
+FontListTest.Fonts_DeriveWithSizeDelta
+FontListTest.Fonts_DescStringWithStyleInFlexibleFormat_RoundTrip
+FontListTest.Fonts_FontVector_RoundTrip
+FontListTest.Fonts_FromDescString
+FontListTest.Fonts_FromDescStringInFlexibleFormat
+FontListTest.Fonts_FromDescStringWithStyleInFlexibleFormat
+FontListTest.Fonts_FromFont
+FontListTest.Fonts_FromFontVector
+FontListTest.Fonts_FromFontWithNonNormalStyle
+FontListTest.Fonts_GetHeight_GetBaseline
+FontListTest.Fonts_GetStyle
+FontTest.Ascent
+FontTest.AvgWidths
+FontTest.CapHeight
+FontTest.GetActualFontNameForTesting
+FontTest.Height
+FontTest.LoadArial
+FontTest.LoadArialBold
+TextUtilsTest.GetStringWidth
diff --git a/build/android/pylib/gtest/filter/ui_unittests_disabled b/build/android/pylib/gtest/filter/ui_unittests_disabled
index de04dba..2f6e9af 100644
--- a/build/android/pylib/gtest/filter/ui_unittests_disabled
+++ b/build/android/pylib/gtest/filter/ui_unittests_disabled
@@ -1,31 +1,3 @@
-# List of suppressions
-# This file was automatically generated by build/android/run_tests.py
 CanvasTest.StringSizeEmptyString
 CanvasTest.StringWidth
-ClipboardTest.RTFTest
-FontListTest.FontDescString_Derive
-FontListTest.FontDescString_FromFont
-FontListTest.FontDescString_FromFontNamesStyleAndSize
-FontListTest.FontDescString_FromFontVector
-FontListTest.FontDescString_FromFontWithNonNormalStyle
-FontListTest.Fonts_Derive
-FontListTest.Fonts_DeriveWithSizeDelta
-FontListTest.Fonts_DescStringWithStyleInFlexibleFormat_RoundTrip
-FontListTest.Fonts_FontVector_RoundTrip
-FontListTest.Fonts_FromDescString
-FontListTest.Fonts_FromDescStringInFlexibleFormat
-FontListTest.Fonts_FromDescStringWithStyleInFlexibleFormat
-FontListTest.Fonts_FromFont
-FontListTest.Fonts_FromFontVector
-FontListTest.Fonts_FromFontWithNonNormalStyle
-FontListTest.Fonts_GetHeight_GetBaseline
-FontListTest.Fonts_GetStyle
-FontTest.Ascent
-FontTest.AvgWidths
-FontTest.CapHeight
-FontTest.GetActualFontNameForTesting
-FontTest.Height
-FontTest.LoadArial
-FontTest.LoadArialBold
 ResourceBundleTest.DelegateGetFontList
-TextUtilsTest.GetStringWidth
diff --git a/ui/gfx/gfx_tests.gyp b/ui/gfx/gfx_tests.gyp
index 4199064..a8ace7a 100644
--- a/ui/gfx/gfx_tests.gyp
+++ b/ui/gfx/gfx_tests.gyp
@@ -115,6 +115,11 @@
             'text_elider_unittest.cc',
           ],
         }],
+        ['OS == "android"', {
+          'dependencies': [
+            '../../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
       ],
     }
   ],
@@ -125,6 +130,7 @@
           'target_name': 'gfx_unittests_apk',
           'type': 'none',
           'dependencies': [
+            '../android/ui_android.gyp:ui_java',
             'gfx_unittests',
           ],
           'variables': {
diff --git a/ui/gfx/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc
index 3ac61bc..14ceef9 100644
--- a/ui/gfx/test/run_all_unittests.cc
+++ b/ui/gfx/test/run_all_unittests.cc
@@ -12,6 +12,11 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#include "ui/gfx/android/gfx_jni_registrar.h"
+#endif
+
 namespace {
 
 class GfxTestSuite : public base::TestSuite {
@@ -21,6 +26,11 @@ class GfxTestSuite : public base::TestSuite {
  protected:
   virtual void Initialize() OVERRIDE {
     base::TestSuite::Initialize();
+
+#if defined(OS_ANDROID)
+    gfx::android::RegisterJni(base::android::AttachCurrentThread());
+#endif
+
     ui::RegisterPathProvider();
 
     base::FilePath ui_test_pak_path;