Merge 70195 - Don't build using GPO for the tests EXEs we build during...

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2010 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,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 204 matching lines @@
                   'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
                 },
               },
               'dependencies': [
                 # TODO(slightlyoff): Get automation targets working on OS X
                 '../chrome/chrome.gyp:automation',
               ],
             }],
           ],
         }],
+        ['OS=="win" and buildtype=="Official"', {
+          'configurations': {
+            'Release': {
+              'msvs_settings': {
+                'VCCLCompilerTool': {
+                  'WholeProgramOptimization': 'false',
+                },
+              },
+            },
+          },
+        },],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-lshdocvw.lib', '-loleacc.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'DelayLoadDLLs': ['shdocvw.dll'],
             },
@@ skipping 950 matching lines @@
   ],  # 'conditions'
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: