From 2a2e49b13b1c97e97e432a9bcc83b40b4ae77e89 Mon Sep 17 00:00:00 2001
From: jaekyun <jaekyun@chromium.org>
Date: Wed, 10 Dec 2014 18:49:10 -0800
Subject: [PATCH] Replace SystemUIResourceManager with ResourceManager

And move UIResourceClientAndroid and UIResourceProvider under ui/android.

BUG=426939

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

Cr-Original-Commit-Position: refs/heads/master@{#307844}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: f229b81b8d31706d3aa922294d1e9c8f567bd400
---
 all.gyp                             | 2 ++
 android/pylib/gtest/gtest_config.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/all.gyp b/all.gyp
index 149ac0a3b..ee72ddd88 100644
--- a/all.gyp
+++ b/all.gyp
@@ -846,6 +846,7 @@
             '../tools/android/android_tools.gyp:android_tools',
             '../tools/android/android_tools.gyp:memconsumer',
             '../tools/android/findbugs_plugin/findbugs_plugin.gyp:findbugs_plugin_test',
+            '../ui/android/ui_android.gyp:ui_android_unittests',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
             '../ui/events/events.gyp:events_unittests',
             '../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
@@ -874,6 +875,7 @@
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../tools/android/heap_profiler/heap_profiler.gyp:heap_profiler_unittests_apk',
+            '../ui/android/ui_android.gyp:ui_android_unittests_apk',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests_apk',
             '../ui/events/events.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
diff --git a/android/pylib/gtest/gtest_config.py b/android/pylib/gtest/gtest_config.py
index 20aaf687c..cf72d65f9 100644
--- a/android/pylib/gtest/gtest_config.py
+++ b/android/pylib/gtest/gtest_config.py
@@ -35,6 +35,7 @@ STABLE_TEST_SUITES = [
     'sandbox_linux_unittests',
     'sql_unittests',
     'sync_unit_tests',
+    'ui_android_unittests',
     'ui_base_unittests',
     'ui_touch_selection_unittests',
     'unit_tests',