Improve the ScopedHandle verifier.

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': [
     ['OS=="mac" or OS=="win"', {
       'targets': [
         {
           'target_name': 'chrome_dll',
           'type': 'none',
@@ skipping 53 matching lines @@
                                  '$(OutDir)\\initial\\chrome.dll.pdb',
                                  '$(OutDir)\\chrome.dll.pdb'],
                     }
                   ]
                 }]
               ],
             }],
           ]
         },
         {
           # GN version: //chrome:main_dll

[sky, 2014/08/25 19:58:49]

Do you need to update gn files too?

[rvargas (doing something else), 2014/08/25 21:25:48]

Done. I was looking at chrome/app/build.gn and I missed chrome/build.gn (and
this line)

           'target_name': 'chrome_main_dll',
           'type': 'shared_library',
           'variables': {
             'enable_wexit_time_destructors': 1,
           },
           'dependencies': [
             '<@(chromium_browser_dependencies)',
             '../content/content.gyp:content_app_browser',
           ],
           'conditions': [
@@ skipping 31 matching lines @@
                 '../net/net.gyp:net_resources',
                 '../ui/views/views.gyp:views',
               ],
               'sources': [
                 'app/chrome_command_ids.h',
                 'app/chrome_dll.rc',
                 'app/chrome_dll_resource.h',
                 'app/chrome_main.cc',
                 'app/chrome_main_delegate.cc',
                 'app/chrome_main_delegate.h',
+                'app/close_handle_hook_win.cc',

[sky, 2014/08/25 19:58:49]

I think you should create a 'sources' section that is not conditional and put
these files there (that's the general pattern we do with gyp files).

[rvargas (doing something else), 2014/08/25 21:25:48]

Done. Do you want me to add *.rc to the common sources and remove them for mac?

[sky, 2014/08/25 22:49:06]

If we do that for other rc files, yes.

+                'app/close_handle_hook_win.h',
                 'app/delay_load_hook_win.cc',
                 'app/delay_load_hook_win.h',
 
                 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
                 '../base/win/dllmain.cc',
 
                 # Cursors.
                 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',
               ],
               'include_dirs': [
@@ skipping 207 matching lines @@
             'policy_path_parser',
           ],
           'defines': [
             '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',
+            'app/close_handle_hook_win.cc',
+            'app/close_handle_hook_win.h',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
               ],
               'conditions': [
                 ['chrome_pgo_phase==1', {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkTimeCodeGeneration': '2',
                     },
                   },
                 }],
                 ['chrome_pgo_phase==2', {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkTimeCodeGeneration': '3',
                     },
                   },
                 }],
               ]
             }],
           ],
         },  # target chrome_child_dll
       ],
     }],
   ],
 }