Reland of move configuration policy from chrome build files.

chrome/chrome.gyp

 # 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': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
     # the link of the actual chrome (or chromium) executable on
@@ skipping 538 matching lines @@
             'profile_account_management_metrics_java',
             'resource_id_java',
             'shortcut_source_java',
             'signin_metrics_enum_java',
             'tab_load_status_java',
             'website_settings_action_java',
             '../base/base.gyp:base',
             '../base/base.gyp:base_build_config_gen',
             '../build/android/java_google_api_keys.gyp:google_api_keys_java',
             '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
+            '../components/components.gyp:app_restrictions_resources',
             '../components/components.gyp:autocomplete_match_java',
             '../components/components.gyp:autocomplete_match_type_java',
             '../components/components.gyp:bookmarks_java',
             '../components/components.gyp:dom_distiller_core_java',
             '../components/components.gyp:gcm_driver_java',
             '../components/components.gyp:infobar_delegate_java',
             '../components/components.gyp:invalidation_java',
             '../components/components.gyp:investigated_scenario_java',
             '../components/components.gyp:navigation_interception_java',
             '../components/components.gyp:offline_page_feature_enums_java',
             '../components/components.gyp:offline_page_model_enums_java',
+            '../components/components.gyp:policy_java',
             '../components/components.gyp:precache_java',
             '../components/components.gyp:safe_json_java',
             '../components/components.gyp:security_state_enums_java',
             '../components/components.gyp:service_tab_launcher_java',
             '../components/components.gyp:signin_core_browser_java',
             '../components/components.gyp:variations_java',
             '../components/components.gyp:web_contents_delegate_android_java',
             '../components/components.gyp:web_restrictions_java',
             '../components/components_strings.gyp:components_strings',
             '../content/content.gyp:content_java',
@@ skipping 31 matching lines @@
             'res_extra_dirs': [
               '<@(android_branding_res_dirs)',
               '<(SHARED_INTERMEDIATE_DIR)/chrome/java/res',
               '<(SHARED_INTERMEDIATE_DIR)/components/strings/java/res',
             ],
             'res_extra_files': [
               '<!@(find <(android_branding_res_dirs) -type f)',
               '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
             ],
           },
-          'conditions': [
-            ['configuration_policy == 1', {
-              'dependencies': [
-                '../components/components.gyp:app_restrictions_resources',
-                '../components/components.gyp:policy_java',
-              ],
-            }],
-          ],
           'includes': [
             '../build/java.gypi',
           ],
         },
         {
           # GN: //chrome/android:chrome_strings_grd
           'target_name': 'chrome_strings_grd',
           'type': 'none',
           'variables': {
             'grd_file': '../chrome/android/java/strings/android_chrome_strings.grd',
@@ skipping 67 matching lines @@
           'variables': {
             'source_file': 'browser/android/data_usage/data_use_tab_ui_manager_android.cc',
           },
           'includes': [ '../build/android/java_cpp_enum.gypi' ],
         },
       ], # 'targets'
       'includes': [
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
-    ['configuration_policy==1 and OS!="android" and OS!="ios"', {
+    ['OS!="android" and OS!="ios"', {
       'includes': [ 'policy.gypi', ],
     }],
     ['enable_extensions==1', {
       'includes': [
         'chrome_browser_extensions.gypi',
       ],
     }],
     ['enable_print_preview==1', {
       'targets': [
         {
@@ skipping 82 matching lines @@
                 # expired. crbug.com/577698
                 '../components/components.gyp:startup_metric_utils_common',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }