Convert ChromeSyncShell to use ChromePublic infrastructure (try #2)

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.
 {
   'variables': {
     'chrome_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 3074 matching lines @@
         {
           # GN: //chrome/android:uiautomator_tests
           'target_name': 'chrome_uiautomator_tests',
           'type': 'none',
           'dependencies': [
             'chrome_uiautomator_tests_java',
           ],
           'includes': [ '../build/uiautomator_test.gypi' ],
         },
         {
-          # GN: //chrome/android:chrome_sync_shell_test_apk
-          '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',
-            '../sync/sync.gyp:test_support_sync_proto_java',
-          ],
-          'variables': {
-            'apk_name': 'ChromeSyncShellTest',
-            'java_in_dir': 'android/sync_shell/javatests',
-            'additional_src_dirs': [ 'android/shell/javatests', ],
-            'is_test_apk': 1,
-            'test_type': 'instrumentation',
-          },
-          'includes': [
-            '../build/java_apk.gypi',
-            '../build/android/test_runner.gypi',
-          ],
-        },
-        {
           # GN: //chrome/test/android:chrome_java_test_support
           'target_name': 'chrome_java_test_support',
           'type': 'none',
           'variables': {
             'java_in_dir': '../chrome/test/android/javatests',
           },
           'dependencies': [
             'chrome_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
@@ skipping 255 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }