Relanding this as this did not fix the chromiumos breakage.

chrome/chrome_tests.gypi

 # Copyright (c) 2012 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 1434 matching lines @@
         'browser/policy/policy_map_unittest.cc',
         'browser/policy/policy_path_parser_unittest.cc',
         'browser/policy/policy_service_impl_unittest.cc',
         'browser/policy/proxy_policy_provider_unittest.cc',
         'browser/policy/testing_cloud_policy_subsystem.cc',
         'browser/policy/testing_cloud_policy_subsystem.h',
         'browser/policy/testing_policy_url_fetcher_factory.cc',
         'browser/policy/testing_policy_url_fetcher_factory.h',
         'browser/policy/url_blacklist_manager_unittest.cc',
         'browser/policy/user_cloud_policy_manager_unittest.cc',
+        'browser/policy/user_cloud_policy_store_unittest.cc',
         'browser/policy/user_cloud_policy_store_chromeos_unittest.cc',
         'browser/policy/user_policy_cache_unittest.cc',
+        'browser/policy/user_policy_signin_service_unittest.cc',
         'browser/predictors/autocomplete_action_predictor_table_unittest.cc',
         'browser/predictors/autocomplete_action_predictor_unittest.cc',
         'browser/predictors/resource_prefetch_predictor_unittest.cc',
         'browser/predictors/resource_prefetch_predictor_tables_unittest.cc',
         'browser/preferences_mock_mac.cc',
         'browser/preferences_mock_mac.h',
         'browser/prefs/command_line_pref_store_unittest.cc',
         'browser/prefs/incognito_mode_prefs_unittest.cc',
         'browser/prefs/overlay_user_pref_store_unittest.cc',
         'browser/prefs/pref_change_registrar_unittest.cc',
@@ skipping 712 matching lines @@
         ['enable_session_service!=1', {
           'sources!': [
             'browser/sessions/session_service_unittest.cc',
           ],
         }],
         ['chromeos==1', {
           'sources/': [
             ['exclude', '^browser/media_gallery/media_device_notifications_linux_unittest.cc'],
             ['exclude', '^browser/password_manager/native_backend_gnome_x_unittest.cc'],
             ['exclude', '^browser/password_manager/native_backend_kwallet_x_unittest.cc'],
+            ['exclude', '^browser/policy/user_cloud_policy_store_unittest.cc'],
+            ['exclude', '^browser/policy/user_policy_signin_service_unittest.cc'],
+
             ['exclude', '^browser/safe_browsing/download_protection_service_unittest.cc' ],
           ],
           'sources': [
             'browser/ui/webui/feedback_ui_unittest.cc',
           ],
         }, { # else: chromeos == 0
           'sources/': [
             ['exclude', '^browser/chromeos/'],
             ['exclude', '^browser/media_gallery/media_device_notifications_chromeos_unittest.cc'],
             ['exclude', '^browser/net/gaia/gaia_oauth_fetcher_unittest.cc'],
@@ skipping 2468 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'browser_tests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }