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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 44f1adcf5bafe3604e48138e88529aded39904ae..49f44e19013ed57b6cf0d599312be4651e7b6062 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -993,7 +993,6 @@
       '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',
@@ -1088,7 +1087,7 @@
       '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.
@@ -1213,6 +1212,7 @@
       '../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
@@ -1591,8 +1591,6 @@
       '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',
@@ -1788,7 +1786,7 @@
             '../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.
@@ -2382,7 +2380,6 @@
             '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', {
@@ -3182,6 +3179,7 @@
             '../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' ],
         },