Modify ThreadChecker and NonThreadSafe so that their functionality is

base/base.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.
 
 {
   'target_defaults': {
     'variables': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 233 matching lines @@
           'sys_info_win.cc',
           'sys_string_conversions.h',
           'sys_string_conversions_linux.cc',
           'sys_string_conversions_mac.mm',
           'sys_string_conversions_win.cc',
           'task.cc',
           'task.h',
           'task_queue.cc',
           'task_queue.h',
           'template_util.h',
-          'threading/non_thread_safe.cc',
           'threading/non_thread_safe.h',
+          'threading/non_thread_safe_impl.cc',
+          'threading/non_thread_safe_impl.h',
           'threading/platform_thread.h',
           'threading/platform_thread_mac.mm',
           'threading/platform_thread_posix.cc',
           'threading/platform_thread_win.cc',
           'threading/simple_thread.cc',
           'threading/simple_thread.h',
           'threading/thread.cc',
           'threading/thread.h',
-          'threading/thread_checker.cc',
           'threading/thread_checker.h',
+          'threading/thread_checker_impl.cc',
+          'threading/thread_checker_impl.h',
           'threading/thread_collision_warner.cc',
           'threading/thread_collision_warner.h',
           'threading/thread_local.h',
           'threading/thread_local_posix.cc',
           'threading/thread_local_storage.h',
           'threading/thread_local_storage_posix.cc',
           'threading/thread_local_storage_win.cc',
           'threading/thread_local_win.cc',
           'threading/thread_restrictions.h',
           'threading/thread_restrictions.cc',
@@ skipping 465 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }