Remove configuration policy from chrome build files.

chrome/chrome_dll.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.
 {
   'conditions': [
     # Dummy target to allow chrome to require chrome_dll to build
     # without actually linking to the library
     ['OS=="mac"', {
       'targets': [
         {
@@ skipping 110 matching lines @@
           ],
           'dependencies': [
             '<@(chromium_browser_dependencies)',
             'chrome_features.gyp:chrome_common_features',
             '../content/content.gyp:content_app_browser',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
-              ],
-            }],
-            ['OS=="win" and configuration_policy==1', {
-              'dependencies': [
                 '<(DEPTH)/components/components.gyp:policy',
               ],
             }],
             ['use_aura==1', {
               'dependencies': [
                 '../ui/compositor/compositor.gyp:compositor',
               ],
             }],
             ['OS=="win" and target_arch=="ia32"', {
               # Add a dependency to custom import library for user32 delay
@@ skipping 211 matching lines @@
             'CHROME_MULTIPLE_DLL_CHILD',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
             'app/chrome_main.cc',
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
           'conditions': [
             ['OS=="win"', {
+              'dependencies': [
+                '<(DEPTH)/components/components.gyp:policy',
+              ],
               'conditions': [
                 ['chrome_pgo_phase!=0', {
                   # Disable Warning 4702 ("Unreachable code") for the WPO/PGO
                   # builds. Probably anything that this would catch that
                   # wouldn't be caught in a normal build isn't going to
                   # actually be a bug, so the incremental value of C4702 for
                   # PGO builds is likely very small.
                   'msvs_disabled_warnings': [
                     4702
                   ],
@@ skipping 16 matching lines @@
                 }],
                 ['chrome_pgo_phase==2', {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkTimeCodeGeneration': '3',
                     },
                   },
                 }],
               ]
             }],
-            ['OS=="win" and configuration_policy==1', {
-              'dependencies': [
-                '<(DEPTH)/components/components.gyp:policy',
-              ],
-            }],
-            ['configuration_policy==1', {
-              'dependencies': [
-                'policy_path_parser',

[Andrew T Wilson (Slow), 2016/03/22 00:01:27]

Did we lose the dependency on policy_path_parser?

[brettw, 2016/03/22 17:17:44]

Oh yeah, I got confused because it's listed in the file elsewhere, but it's
actually on another target.

-              ],
-            }],
             ['enable_plugins==1', {
               'dependencies': [
                 '../pdf/pdf.gyp:pdf',
               ],
             }],
           ],
         },  # target chrome_child_dll
       ],
     }],
   ],
 }