Revert of Move ConfigurationPolicyProvider, etc. to components/policy.

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.
 
 {
   'targets': [
     {
       'target_name': 'policy_component',
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
         'json_schema',
         'component_strings.gyp:component_strings',
       ],
       'defines': [
         'POLICY_COMPONENT_IMPLEMENTATION',
       ],
       'include_dirs': [
         '..',
       ],
       'conditions': [
         ['configuration_policy==1', {
           'sources': [
-            'policy/core/common/configuration_policy_provider.cc',
-            'policy/core/common/configuration_policy_provider.h',
+            'policy/core/common/policy_bundle.cc',
+            'policy/core/common/policy_bundle.h',
             'policy/core/common/external_data_fetcher.cc',
             'policy/core/common/external_data_fetcher.h',
             'policy/core/common/external_data_manager.h',
-            'policy/core/common/policy_bundle.cc',
-            'policy/core/common/policy_bundle.h',
             'policy/core/common/policy_details.h',
             'policy/core/common/policy_namespace.cc',
             'policy/core/common/policy_namespace.h',
             'policy/core/common/policy_map.cc',
             'policy/core/common/policy_map.h',
             'policy/core/common/policy_pref_names.cc',
             'policy/core/common/policy_pref_names.h',
             'policy/core/common/policy_switches.cc',
             'policy/core/common/policy_switches.h',
             'policy/core/common/policy_types.h',
@@ skipping 18 matching lines @@
             'policy/core/common/external_data_manager.h',
             'policy/core/common/policy_map.cc',
             'policy/core/common/policy_map.h',
             'policy/core/common/policy_namespace.cc',
             'policy/core/common/policy_namespace.h',
           ],
         }],
       ],
     },
   ],
-  'conditions': [
-    ['configuration_policy==1', {
-      'targets': [
-        {
-          'target_name': 'policy_test_support',
-          'type': 'static_library',
-          # This must be undefined so that POLICY_EXPORT works correctly in
-          # the static_library build.
-          'defines!': [
-            'POLICY_COMPONENT_IMPLEMENTATION',
-          ],
-          'dependencies': [
-            'policy_component',
-            '../testing/gmock.gyp:gmock',
-            '../testing/gtest.gyp:gtest',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'policy/core/common/configuration_policy_provider_test.cc',
-            'policy/core/common/configuration_policy_provider_test.h',
-            'policy/core/common/mock_configuration_policy_provider.cc',
-            'policy/core/common/mock_configuration_policy_provider.h',
-          ],
-        },
-      ],
-    }],
-  ],
 }