Removing FakePolicyWatcher and introducing FakeAsyncPolicyLoader.

components/policy.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.
 
 {
   'includes': [
     # Included to get 'mac_bundle_id' and other variables.
     '../build/chrome_settings.gypi',
   ],
   'variables': {
@@ skipping 293 matching lines @@
             'policy/core/common/cloud/mock_cloud_policy_store.cc',
             'policy/core/common/cloud/mock_cloud_policy_store.h',
             'policy/core/common/cloud/mock_device_management_service.cc',
             'policy/core/common/cloud/mock_device_management_service.h',
             'policy/core/common/cloud/mock_user_cloud_policy_store.cc',
             'policy/core/common/cloud/mock_user_cloud_policy_store.h',
             'policy/core/common/cloud/policy_builder.cc',
             'policy/core/common/cloud/policy_builder.h',
             'policy/core/common/configuration_policy_provider_test.cc',
             'policy/core/common/configuration_policy_provider_test.h',
+            'policy/core/common/fake_async_policy_loader.cc',
+            'policy/core/common/fake_async_policy_loader.h',
             'policy/core/common/mock_configuration_policy_provider.cc',
             'policy/core/common/mock_configuration_policy_provider.h',
             'policy/core/common/mock_policy_service.cc',
             'policy/core/common/mock_policy_service.h',
             'policy/core/common/policy_test_utils.cc',
             'policy/core/common/policy_test_utils.h',
             'policy/core/common/preferences_mock_mac.cc',
             'policy/core/common/preferences_mock_mac.h',
           ],
           'conditions': [
+            ['OS=="android"', {
+              'sources!': [
+                'policy/core/common/fake_async_policy_loader.cc',
+                'policy/core/common/fake_async_policy_loader.h',
+              ],
+            }],
             ['chromeos==1', {
               'sources!': [
                 'policy/core/common/cloud/mock_user_cloud_policy_store.cc',
                 'policy/core/common/cloud/mock_user_cloud_policy_store.h',
               ],
             }],
           ],
         },
       ],
     }],
@@ skipping 127 matching lines @@
               'message':
                   'Copy the Localizable.strings files to the manifest bundle',
               'process_outputs_as_mac_bundle_resources': 1,
             },
           ],
         },
       ],
     }],
   ],
 }