Relanding this as this did not fix the chromiumos breakage.

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 1746 matching lines @@
         'browser/policy/policy_service_impl.cc',
         'browser/policy/policy_service_impl.h',
         'browser/policy/policy_service_stub.cc',
         'browser/policy/policy_service_stub.h',
         'browser/policy/proxy_policy_provider.cc',
         'browser/policy/proxy_policy_provider.h',
         'browser/policy/url_blacklist_manager.cc',
         'browser/policy/url_blacklist_manager.h',
         'browser/policy/user_cloud_policy_manager.cc',
         'browser/policy/user_cloud_policy_manager.h',
+        'browser/policy/user_cloud_policy_store.cc',
+        'browser/policy/user_cloud_policy_store.h',
+        'browser/policy/user_cloud_policy_store_base.cc',
+        'browser/policy/user_cloud_policy_store_base.h',
         'browser/policy/user_cloud_policy_store_chromeos.cc',
         'browser/policy/user_cloud_policy_store_chromeos.h',
         'browser/policy/user_policy_cache.cc',
         'browser/policy/user_policy_cache.h',
         'browser/policy/user_policy_disk_cache.cc',
         'browser/policy/user_policy_disk_cache.h',
+        'browser/policy/user_policy_signin_service.cc',
+        'browser/policy/user_policy_signin_service.h',
+        'browser/policy/user_policy_signin_service_factory.cc',
+        'browser/policy/user_policy_signin_service_factory.h',
         'browser/policy/user_policy_token_cache.cc',
         'browser/policy/user_policy_token_cache.h',
         'browser/predictors/autocomplete_action_predictor.cc',
         'browser/predictors/autocomplete_action_predictor.h',
         'browser/predictors/autocomplete_action_predictor_factory.cc',
         'browser/predictors/autocomplete_action_predictor_factory.h',
         'browser/predictors/autocomplete_action_predictor_table.cc',
         'browser/predictors/autocomplete_action_predictor_table.h',
         'browser/predictors/predictor_database.cc',
         'browser/predictors/predictor_database.h',
@@ skipping 2825 matching lines @@
             ['exclude', 'browser/first_run/upgrade_util_linux.cc'],
             ['exclude', 'browser/icon_loader_linux.cc'],
             ['exclude', 'browser/icon_manager_linux.cc'],
             ['exclude', 'browser/idle_linux.cc'],
             ['exclude', 'browser/media_gallery/media_device_notifications_linux.cc'],
             ['exclude', 'browser/media_gallery/media_device_notifications_linux.h'],
             ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
             ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
             ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
             ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
+            ['exclude', 'browser/policy/user_cloud_policy_store.cc'],
+            ['exclude', 'browser/policy/user_cloud_policy_store.h'],
+            ['exclude', 'browser/policy/user_policy_signin_service.cc'],
+            ['exclude', 'browser/policy/user_policy_signin_service.h'],
+            ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'],
+            ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
             ['exclude', 'browser/platform_util_linux.cc'],
             ['exclude', 'browser/speech/extension_api/tts_extension_api_linux.cc'],
             ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
             ['exclude', 'browser/ui/webui/help/version_updater_basic.h'],
             ['exclude', 'browser/upgrade_detector_impl.cc'],
             ['exclude', 'browser/upgrade_detector_impl.h'],
           ],
         }],
         ['file_manager_extension==0', {
           'sources/': [
@@ skipping 896 matching lines @@
           'includes': [ '../build/jni_generator.gypi' ],
           'dependencies': [
             'android_jar_jni_headers',
           ],
         },
       ],
      },
     ],
   ],
 }