Merge 249937 "Linux Sandbox: Stop GPU watchdog in accountable way."

sandbox/linux/sandbox_linux.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.
 
 {
   'variables': {
     'conditions': [
       ['OS=="linux"', {
         'compile_suid_client': 1,
         'compile_credentials': 1,
@@ skipping 175 matching lines @@
         '../..',
       ],
     },
     { 'target_name': 'sandbox_services',
       'type': 'static_library',
       'sources': [
         'services/broker_process.cc',
         'services/broker_process.h',
         'services/init_process_reaper.cc',
         'services/init_process_reaper.h',
+        'services/thread_helpers.cc',
+        'services/thread_helpers.h',
       ],
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'conditions': [
         ['compile_credentials==1', {
           'sources': [
             'services/credentials.cc',
             'services/credentials.h',
           ],
@@ skipping 72 matching lines @@
         },
         'dependencies': [
           'sandbox_linux_jni_unittests',
         ],
         'includes': [ '../../build/apk_test.gypi' ],
         }
       ],
     }],
   ],
 }