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

ui/gfx/gfx.gyp

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 499 matching lines @@
         ['OS == "win"', {
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
         ['OS != "mac" and OS != "ios"', {
           'sources': [
             'transform_unittest.cc',
             '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',
+          ],
+        }],
       ],
     }
   ],
   'conditions': [
     ['OS=="android"' , {
      'targets': [
        {
          'target_name': 'gfx_jni_headers',
          'type': 'none',
          'sources': [
@@ skipping 22 matching lines @@
           ],
           'variables': {
             'test_suite_name': 'gfx_unittests',
           },
           'includes': [ '../../build/apk_test.gypi' ],
         },
       ],
     }],
   ],
 }