Add a testing restriction for whether Google Play Services is up-to-date.

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 975 matching lines @@
       'test/data/webui/net_internals/waterfall_view.js',
       'test/data/webui/net_internals/sdch_view.js',
       'test/data/webui/ntp4.js',
       'test/data/webui/polymer_browser_test_base.js',
       'test/data/webui/print_preview.js',
       'test/data/webui/sandboxstatus_browsertest.js',
       'test/data/webui/settings/advanced_page_browsertest.js',
       'test/data/webui/settings/appearance_browsertest.js',
       'test/data/webui/settings/basic_page_browsertest.js',
       'test/data/webui/settings/bluetooth_page_browsertest_chromeos.js',
-      'test/data/webui/settings/change_picture_browsertest_chromeos.js',
       'test/data/webui/settings/cr_settings_browsertest.js',
       'test/data/webui/settings/on_startup_browsertest.js',
       'test/data/webui/settings/settings_page_browsertest.js',
       'test/data/webui/settings/settings_passwords_section_browsertest.js',
       'test/data/webui/settings/settings_subpage_browsertest.js',
     ],
     # TODO(rockot) bug 505926: These should be moved to a target in
     # //extensions but have old dependencies on chrome files. The chrome
     # dependencies should be removed and these moved to the
     # extensions_browsertests target.
@@ skipping 74 matching lines @@
       'test/base/interactive_test_utils.cc',
       'test/base/interactive_test_utils.h',
       'test/base/interactive_test_utils_aura.cc',
       'test/base/interactive_test_utils_aura.h',
       'test/base/interactive_test_utils_mac.mm',
       'test/base/interactive_test_utils_views.cc',
       'test/base/interactive_test_utils_win.cc',
       'test/base/interactive_ui_tests_main.cc',
       'test/base/view_event_test_platform_part.h',
       'test/base/view_event_test_platform_part_chromeos.cc',
-      'test/base/view_event_test_platform_part_default.cc',
+      'test/base/view_event_test_platform_part_mac.mm',
       'test/ppapi/ppapi_interactive_browsertest.cc',
     ],
     # Panels sources not related to UI toolkit. ChromeOS doesn't use panels.
     'chrome_interactive_ui_test_panels_sources': [
       'browser/ui/panels/detached_panel_browsertest.cc',
       'browser/ui/panels/docked_panel_browsertest.cc',
       'browser/ui/panels/panel_browsertest.cc',
       'browser/ui/panels/panel_resize_browsertest.cc',
     ],
     'chrome_interactive_ui_test_panels_views_sources': [
@@ skipping 104 matching lines @@
       'browser/chromeos/login/users/wallpaper/wallpaper_manager_browsertest.cc',
       'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.cc',
       'browser/chromeos/login/users/wallpaper/wallpaper_manager_test_utils.h',
       'test/data/chromeos/service_login.html',
     ],
     'chrome_interactive_ui_test_ash_sources': [
       '../ash/drag_drop/drag_drop_interactive_uitest.cc',
       '../ash/wm/ash_native_cursor_manager_interactive_uitest.cc',
       'browser/ui/views/ash/tab_scrubber_browsertest.cc',
       'browser/ui/window_sizer/window_sizer_ash_uitest.cc',
+      'test/base/view_event_test_platform_part_ash.cc',
     ],
     'chrome_interactive_ui_test_non_desktop_linux_sources': [
       # TODO(port): Everything here times out. Attempts have been made to fix
       # the individual failures, but each time I disable a test from these
       # suites, it seems like one or another starts timing out too.
       'browser/extensions/api/tabs/tabs_interactive_test.cc',
     ],
     'chrome_interactive_ui_test_non_linux_and_chromeos_sources': [
       # TODO(port): Disable all the interactive panel tests on all linux
       # platforms. These are badly busted on linux_aura, also time out
@@ skipping 358 matching lines @@
         '../components/components.gyp:password_manager_core_browser_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'browser/password_manager/password_manager_test_base.cc',
         'browser/password_manager/password_manager_test_base.h',
-        'browser/signin/token_revoker_test_utils.cc',
-        'browser/signin/token_revoker_test_utils.h',
         'browser/ui/webui/signin/login_ui_test_utils.cc',
         'browser/ui/webui/signin/login_ui_test_utils.h',
         'test/base/in_process_browser_test.cc',
         'test/base/in_process_browser_test.h',
         'test/base/in_process_browser_test_mac.cc',
         'test/base/ui_test_utils.cc',
         'test/base/ui_test_utils.h',
       ],
       'conditions': [
         ['enable_plugins==1', {
@@ skipping 175 matching lines @@
           ],
           'sources': [
             '<@(chrome_interactive_ui_test_chromeos_sources)',
           ],
           'sources!': [
             # Note: List duplicated in GN build.
             '../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc',
             '../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc',
 
             # Use only the _chromeos version on ChromeOS.
-            'test/base/view_event_test_platform_part_default.cc',
+            'test/base/view_event_test_platform_part_ash.cc',
           ],
         }, {  # Non-ChromeOS.
           # ChromeOS doesn't use panels, everybody else does.
           'sources': [ '<@(chrome_interactive_ui_test_panels_sources)' ],
           'conditions': [
             # TODO(tapted): Include on mac when views panels are ported.
             [ 'toolkit_views==1 and OS != "mac"', {
               'sources': [
                 '<@(chrome_interactive_ui_test_panels_views_sources)',
               ],
@@ skipping 573 matching lines @@
             'browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc',
             'browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc',
             'browser/extensions/api/terminal/terminal_private_apitest.cc',
             'browser/invalidation/profile_invalidation_provider_factory_browsertest.cc',
             'browser/net/nss_context_chromeos_browsertest.cc',
             'browser/ui/ash/keyboard_controller_browsertest.cc',
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
             'test/data/webui/settings/bluetooth_page_browsertest_chromeos.js',
-            'test/data/webui/settings/change_picture_browsertest_chromeos.js',
           ],
         }],
         ['configuration_policy==1', {
           'sources': [ '<@(chrome_browser_tests_policy_sources)' ],
         }],
         ['enable_web_speech==1', {
           'sources': [ '<@(chrome_browser_tests_speech_sources)' ],
         }],
         # TODO(nparker) enable tests for safe_browsing==2.
         ['safe_browsing==1', {
@@ skipping 779 matching lines @@
           'dependencies': [
             'chrome_java',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
             '../components/components.gyp:policy_java_test_support',
             '../content/content_shell_and_tests.gyp:content_java_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_java_test_support',
             '../sync/sync.gyp:sync_java',
             '../sync/sync.gyp:sync_java_test_support',
+            '../third_party/android_tools/android_tools.gyp:google_play_services_javalib'

[jbudorick, 2016/01/25 21:57:49]

What's up with the changes in this file other than this one?

[Yaron, 2016/01/25 22:04:02]

bad switch b/w branches on my part. Perhaps this is also what's making analyze
sad.

           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           # GN: //chrome/test/android/cast_emulator:cast_emulator
           'target_name': 'cast_emulator',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             '../third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
@@ skipping 347 matching lines @@
             'browser',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }