ui: Move android test (scroller) into gfx_unittests target.

This test does not seem to need any ResourceBundle initialization and
does not seem to depend on any global state or extra setup, so it should
be fine to move it straightforward into gfx_unittests without any other
modifications.

BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=ben@chromium.org, danakj@chromium.org
NOTRY=true

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

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

ui/gfx/gfx.gyp

@@ -517,6 +517,16 @@
             'interpolated_transform_unittest.cc',
           ],
         }],
+        ['OS == "android"', {
+          'sources': [
+            'android/scroller_unittest.cc',
+          ],
+        }],
+        ['OS == "android" and gtest_target_type == "shared_library"', {
+          'dependencies': [
+            '../../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
       ],
     }
   ],

ui/ui_unittests.gyp

@@ -135,11 +135,6 @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
-        ['OS == "android"', {
-          'sources': [
-            'gfx/android/scroller_unittest.cc',
-          ],
-        }],
         ['OS == "android" and gtest_target_type == "shared_library"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',