When clearing plugin data at shutdown, wait for it to finish.

webkit/tools/test_shell/test_shell.gypi

 # Copyright (c) 2011 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': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       'resources/pan_east.cur',
       'resources/pan_middle.cur',
@@ skipping 104 matching lines @@
         'webwidget_host_gtk.cc',
         'webwidget_host_win.cc',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
       ],
       'conditions': [
-        # http://code.google.com/p/chromium/issues/detail?id=18337
-        ['target_arch!="x64" and target_arch!="arm"', {
+        ['target_arch!="arm"', {
           'dependencies': [
             'copy_npapi_test_plugin',
           ],
         }],
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
           'dependencies': [
             'test_shell_resources',
             '<(DEPTH)/build/linux/system.gyp:gtk',
             '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
           ],
@@ skipping 358 matching lines @@
               'dependencies': [
                 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         }],
       ],
     },
   ],
   'conditions': [
-    ['target_arch!="x64" and target_arch!="arm"', {
+    ['target_arch!="arm"', {
       'targets': [
         {
           'target_name': 'npapi_test_common',
           'type': 'static_library',
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
             '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
           ],
           'sources': [
             '../../plugins/npapi/test/npapi_constants.cc',
@@ skipping 219 matching lines @@
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: