Use Sync FakeServer in Android tests via custom APK

chrome/chrome_tests.gypi

 # Copyright 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.
 {
   'includes': [
     'js_unittest_vars.gypi',
   ],
   'targets': [
     {
       'target_name': 'interactive_ui_tests',
@@ skipping 2749 matching lines @@
         {
           'target_name': 'chrome_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'chrome_java',
             'chrome_shell_apk_java',
             'chrome_java_test_support',
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
+            # move?

[rlarocque, 2014/08/19 18:04:19]

Remove this comment before committing?

And, to answer your question, I don't think the tests belong in either place.

These tests include:
./android/javatests/src/org/chromium/sync/notifier/InvalidationPreferencesTest.java
./android/javatests/src/org/chromium/sync/notifier/InvalidationClientNameProviderTest.java
./android/javatests/src/org/chromium/sync/notifier/TestableInvalidationService.java
./android/javatests/src/org/chromium/sync/notifier/signin/SyncStatusHelperTest.java
./android/javatests/src/org/chromium/sync/notifier/InvalidationServiceTest.java
./test/android/javatests/src/org/chromium/sync/test/util/MockGrantCredentialsPermissionActivity.java
./test/android/javatests/src/org/chromium/sync/test/util/MockSyncContentResolverDelegate.java
./test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java
./test/android/javatests/src/org/chromium/sync/test/util/AccountHolder.java

On non-Android, the invalidations and signin components have been pulled out of
sync.  There's no reason why the Android tests for these things should remain
part of sync.

[pval...(no longer on Chromium), 2014/08/19 18:43:22]

Removed; thanks for catching this comment.

I haven't touched any of the tests you listed. They will continue to run in
ChromeShellTest.apk as they do today. I think you concern has more to do with
the packages of files like InvalidationPreferencesTest. We can resolve this in
another CL at a later point.

             '../sync/sync.gyp:sync_javatests',
           ],
           'variables': {
             'apk_name': 'ChromeShellTest',
             'java_in_dir': 'android/shell/javatests',
             'additional_src_dirs': ['android/javatests/src'],
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
@@ skipping 21 matching lines @@
         },
         {
           'target_name': 'chrome_shell_uiautomator_tests',
           'type': 'none',
           'dependencies': [
             'chrome_shell_uiautomator_tests_java',
           ],
           'includes': [ '../build/uiautomator_test.gypi' ],
         },
         {
+          'target_name': 'chrome_sync_shell_test_apk',
+          'type': 'none',
+          'dependencies': [
+            'chrome_java',
+            'chrome_sync_shell_apk_java',
+            'chrome_java_test_support',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_java_test_support',
+            '../content/content_shell_and_tests.gyp:content_java_test_support',
+          ],
+          'variables': {
+            'apk_name': 'ChromeSyncShellTest',
+            'java_in_dir': 'android/sync_shell/javatests',
+            'additional_src_dirs': [ 'android/shell/javatests', ],
+            'is_test_apk': 1,
+          },
+          'includes': [ '../build/java_apk.gypi' ],
+        },
+        {
           'target_name': 'chrome_java_test_support',
           'type': 'none',
           'variables': {
             'package_name': 'chrome_java_test_support',
             'java_in_dir': '../chrome/test/android/javatests',
           },
           'dependencies': [
             'chrome_java',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../sync/sync.gyp:sync_java',
@@ skipping 195 matching lines @@
             ['enable_webrtc==1', {
               'dependencies': [
                 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
               ]
             }],
           ],
         }]
     }],
   ],  # 'conditions'
 }